diff options
| author | Pritesh Raithatha <praithatha@nvidia.com> | 2012-04-11 18:41:10 +0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 01:09:03 -0700 |
| commit | 7568c09781f59fb7598517c9547bad68bf758d71 (patch) | |
| tree | 1ad2ec21a22353b6510a9a134803af739f92b790 /drivers/power/bq27x00_battery.c | |
| parent | c45bb78bcd1153a6afadb83efa85da9d08b05e4b (diff) | |
power: bq27x00: start/stop delayed work upon suspend/resume
Cancel delayed work upon suspend and schedule it on resume
Bug 917914
Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com>
Reviewed-on: http://git-master/r/95833
(cherry picked from commit a191d13e9dcdae715c9e03e1980857d00c082dc5)
Change-Id: Ib8292daed3b4115657b1a66e1382ed7c1c448071
Reviewed-on: http://git-master/r/97080
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Pritesh Raithatha <praithatha@nvidia.com>
Tested-by: Sang-Hun Lee <sanlee@nvidia.com>
GVS: Gerrit_Virtual_Submit <kchilds@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Rebase-Id: Rd79245f34b6f97a387d147f43a42bc6ef0e9e7bf
Diffstat (limited to 'drivers/power/bq27x00_battery.c')
| -rw-r--r-- | drivers/power/bq27x00_battery.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c index ce4502fac0de..8849e56b87e3 100644 --- a/drivers/power/bq27x00_battery.c +++ b/drivers/power/bq27x00_battery.c @@ -1014,6 +1014,9 @@ static int bq27x00_battery_suspend(struct device *dev) struct platform_device *pdev = to_platform_device(dev); struct bq27x00_device_info *di = platform_get_drvdata(pdev); + cancel_delayed_work_sync(&di->work); + cancel_delayed_work_sync(&di->external_power_changed_work); + if (di->chip == BQ27510) { ret = bq27x00_write(di, BQ27510_CNTL, BQ27510_CNTL_SET_SLEEP, false); @@ -1049,6 +1052,9 @@ static int bq27x00_battery_resume(struct device *dev) return ret; } } + + schedule_delayed_work(&di->work, HZ); + return 0; } |