Merge tag 'for-v3.7' of git://git.infradead.org/battery-2.6

[~andy/linux] / drivers / power / ab8500_btemp.c

diff --git a/drivers/power/ab8500_btemp.c b/drivers/power/ab8500_btemp.c
index 3041514f4d3f2d38469048dbf5ee96bf879483b6..e3b6395b20ddc226f2324ddfecbf820469accd03 100644 (file)
--- a/drivers/power/ab8500_btemp.c
+++ b/drivers/power/ab8500_btemp.c
@@ -1014,6 +1014,7 @@ static int __devinit ab8500_btemp_probe(struct platform_device *pdev)
                create_singlethread_workqueue("ab8500_btemp_wq");
        if (di->btemp_wq == NULL) {
                dev_err(di->dev, "failed to create work queue\n");
+               ret = -ENOMEM;
                goto free_device_info;
        }