Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53ef1f59 authored by Jonas Aaberg's avatar Jonas Aaberg Committed by Lee Jones
Browse files

ab8500-bm: Flush all work queues before suspending 



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

Signed-off-by: default avatarJonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Reviewed-by: default avatarMarcus COOPER <marcus.xm.cooper@stericsson.com>
parent ffaa39d9

drivers/power/ab8500_charger.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -2866,6 +2866,17 @@ static int ab8500_charger_suspend(struct platform_device *pdev, 
	if (delayed_work_pending(&di->check_hw_failure_work))

	if (delayed_work_pending(&di->check_hw_failure_work))

		cancel_delayed_work(&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;

	return 0;

}

}

#else

#else

drivers/power/ab8500_fg.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -2570,6 +2570,11 @@ static int ab8500_fg_suspend(struct platform_device *pdev, 
	struct ab8500_fg *di = platform_get_drvdata(pdev);

	struct ab8500_fg *di = platform_get_drvdata(pdev);





	flush_delayed_work(&di->fg_periodic_work);

	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

	 * If the FG is enabled we will disable it before going to suspend