Skip to content

Commit

Permalink
ab8500-bm: Flush all work queues before suspending
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jonas Aaberg authored and Lee Jones committed Jan 23, 2013
1 parent ffaa39d commit 53ef1f5
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
11 changes: 11 additions & 0 deletions drivers/power/ab8500_charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions drivers/power/ab8500_fg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 53ef1f5

Please sign in to comment.