diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-24 15:59:06 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-24 15:59:06 +0100 |
| commit | fe413ec322e26179c788c678f24434b94cca34f0 (patch) | |
| tree | e4df7b6bab57dd6f91cd99ffc8fdcb20755fde4f /arch | |
| parent | 5d8e4bddc635dd61ab8b3bcb75c59934e9c1e19f (diff) | |
| download | linux-stable-fe413ec322e26179c788c678f24434b94cca34f0.tar.gz linux-stable-fe413ec322e26179c788c678f24434b94cca34f0.tar.bz2 linux-stable-fe413ec322e26179c788c678f24434b94cca34f0.zip | |
arm/sharpsl: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush toggle_charger and sharpsl_bat works on suspend
instead.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-pxa/sharpsl_pm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c index 8fed027b12dc..e68d46d415f3 100644 --- a/arch/arm/mach-pxa/sharpsl_pm.c +++ b/arch/arm/mach-pxa/sharpsl_pm.c @@ -579,7 +579,8 @@ static int sharpsl_ac_check(void) static int sharpsl_pm_suspend(struct platform_device *pdev, pm_message_t state) { sharpsl_pm.flags |= SHARPSL_SUSPENDED; - flush_scheduled_work(); + flush_delayed_work_sync(&toggle_charger); + flush_delayed_work_sync(&sharpsl_bat); if (sharpsl_pm.charge_mode == CHRG_ON) sharpsl_pm.flags |= SHARPSL_DO_OFFLINE_CHRG; |