ab8500-bm: Flush all work queues before suspending

Flush all workqueues at suspend time to avoid suspending during work.

Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Marcus COOPER <marcus.xm.cooper@stericsson.com>

diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index da965ee615cc5eacaafb3243d1190936e32d22c2..a632b94e38b972cfa9504068fb378bf270bb76fc 100644 (file)
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -2866,6 +2866,17 @@ static int ab8500_charger_suspend(struct platform_device *pdev,
        if (delayed_work_pending(&di->check_hw_failure_work))
                cancel_delayed_work(&di->check_hw_failure_work);
 
+       flush_delayed_work(&di->attach_work);
+       flush_delayed_work(&di->usb_charger_attached_work);
+       flush_delayed_work(&di->ac_charger_attached_work);
+       flush_delayed_work(&di->check_usbchgnotok_work);
+       flush_delayed_work(&di->check_vbat_work);
+       flush_delayed_work(&di->kick_wd_work);
+
+       flush_work(&di->usb_link_status_work);
+       flush_work(&di->ac_work);
+       flush_work(&di->detect_usb_type_work);
+
        return 0;
 }
 #else

diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index c791a5cef2b1a51770e7a570c7e8126bd14d8194..f94c9661e47e105b524effd8ce2968ce33bdee91 100644 (file)
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@ -2570,6 +2570,11 @@ static int ab8500_fg_suspend(struct platform_device *pdev,
        struct ab8500_fg *di = platform_get_drvdata(pdev);
 
        flush_delayed_work(&di->fg_periodic_work);
+       flush_work(&di->fg_work);
+       flush_work(&di->fg_acc_cur_work);
+       flush_delayed_work(&di->fg_reinit_work);
+       flush_delayed_work(&di->fg_low_bat_work);
+       flush_delayed_work(&di->fg_check_hw_failure_work);
 
        /*
         * If the FG is enabled we will disable it before going to suspend