diff options
Diffstat (limited to 'drivers/power/ds2760_battery.c')
-rw-r--r-- | drivers/power/ds2760_battery.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c index b3c01c16a164..e7f89785beef 100644 --- a/drivers/power/ds2760_battery.c +++ b/drivers/power/ds2760_battery.c | |||
@@ -580,10 +580,8 @@ static int ds2760_battery_remove(struct platform_device *pdev) | |||
580 | { | 580 | { |
581 | struct ds2760_device_info *di = platform_get_drvdata(pdev); | 581 | struct ds2760_device_info *di = platform_get_drvdata(pdev); |
582 | 582 | ||
583 | cancel_rearming_delayed_workqueue(di->monitor_wqueue, | 583 | cancel_delayed_work_sync(&di->monitor_work); |
584 | &di->monitor_work); | 584 | cancel_delayed_work_sync(&di->set_charged_work); |
585 | cancel_rearming_delayed_workqueue(di->monitor_wqueue, | ||
586 | &di->set_charged_work); | ||
587 | destroy_workqueue(di->monitor_wqueue); | 585 | destroy_workqueue(di->monitor_wqueue); |
588 | power_supply_unregister(&di->bat); | 586 | power_supply_unregister(&di->bat); |
589 | kfree(di); | 587 | kfree(di); |