diff options
author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2012-05-21 16:05:01 +0200 |
---|---|---|
committer | Mathieu J. Poirier <mathieu.poirier@linaro.org> | 2012-09-25 09:37:08 -0600 |
commit | 5f19f156fd5f414e809a4ec9f7db03dace96140f (patch) | |
tree | d0edfa4c2493b62da14318092bfdb85eabc48418 /drivers/power | |
parent | f52b9e66383d8389857e866b3a76a2119d940444 (diff) |
power: ab8500: Flush & sync all works
Flush and sync all workqueues at suspend to avoid
that we suspend in the middle of a work.
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Marcus COOPER <marcus.xm.cooper@stericsson.com>
Diffstat (limited to 'drivers/power')
-rw-r--r-- | drivers/power/ab8500_charger.c | 11 | ||||
-rw-r--r-- | drivers/power/ab8500_fg.c | 5 |
2 files changed, 16 insertions, 0 deletions
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c index ee5ad7b40fc4..071c7c209102 100644 --- a/drivers/power/ab8500_charger.c +++ b/drivers/power/ab8500_charger.c @@ -2862,6 +2862,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_sync(&di->attach_work); + flush_delayed_work_sync(&di->usb_charger_attached_work); + flush_delayed_work_sync(&di->ac_charger_attached_work); + flush_delayed_work_sync(&di->check_usbchgnotok_work); + flush_delayed_work_sync(&di->check_vbat_work); + flush_delayed_work_sync(&di->kick_wd_work); + + flush_work_sync(&di->usb_link_status_work); + flush_work_sync(&di->ac_work); + flush_work_sync(&di->detect_usb_type_work); + return 0; } #else diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c index e7a0e1f8f52f..0e71e7eabada 100644 --- a/drivers/power/ab8500_fg.c +++ b/drivers/power/ab8500_fg.c @@ -2626,6 +2626,11 @@ static int ab8500_fg_suspend(struct platform_device *pdev, struct ab8500_fg *di = platform_get_drvdata(pdev); flush_delayed_work_sync(&di->fg_periodic_work); + flush_work_sync(&di->fg_work); + flush_work_sync(&di->fg_acc_cur_work); + flush_delayed_work_sync(&di->fg_reinit_work); + flush_delayed_work_sync(&di->fg_low_bat_work); + flush_delayed_work_sync(&di->fg_check_hw_failure_work); /* * If the FG is enabled we will disable it before going to suspend |