diff options
| author |   Tejun Heo <tj@kernel.org> | 2010-12-11 17:51:45 +0100 |
|---|---|---|
| committer |   Anton Vorontsov <cbouatmailru@gmail.com> | 2010-12-22 02:39:56 +0300 |
| commit | bc51e7ff521f28a7f14dc2f25307ad9101d1305a (patch) | |
| tree | 011477cb2e90d2038261170a4e688f795d6720f9 /drivers/power/z2_battery.c | |
| parent | power_supply: Fix use after free and memory leak (diff) | |
| download | linux-dev-bc51e7ff521f28a7f14dc2f25307ad9101d1305a.tar.xz linux-dev-bc51e7ff521f28a7f14dc2f25307ad9101d1305a.zip | |
power_supply: Don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
In battery drivers, the work can be canceled on probe failure and
removal and should be flushed on suspend. Replace
flush_scheduled_work() usages with direct cancels and flushes.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'drivers/power/z2_battery.c')
| -rw-r--r-- | drivers/power/z2_battery.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/power/z2_battery.c b/drivers/power/z2_battery.c index 85064a9f649e..e5ed52d71937 100644 --- a/drivers/power/z2_battery.c +++ b/drivers/power/z2_battery.c @@ -254,7 +254,7 @@ static int __devexit z2_batt_remove(struct i2c_client *client) struct z2_charger *charger = i2c_get_clientdata(client); struct z2_battery_info *info = charger->info; - flush_scheduled_work(); + cancel_work_sync(&charger->bat_work); power_supply_unregister(&charger->batt_ps); kfree(charger->batt_ps.properties); @@ -271,7 +271,9 @@ static int __devexit z2_batt_remove(struct i2c_client *client) #ifdef CONFIG_PM static int z2_batt_suspend(struct i2c_client *client, pm_message_t state) { - flush_scheduled_work(); + struct z2_charger *charger = i2c_get_clientdata(client); + + flush_work_sync(&charger->bat_work); return 0; } |