Merge git://git.infradead.org/battery-2.6

[mv-sheeva.git] / drivers / power / intel_mid_battery.c

diff --git a/drivers/power/intel_mid_battery.c b/drivers/power/intel_mid_battery.c
index 2a10cd361181292f9d6bbef7ef38cda9772c839b..bce3a01da2f0f33137e5901c066cc0f3f2a0f48b 100644 (file)
--- a/drivers/power/intel_mid_battery.c
+++ b/drivers/power/intel_mid_battery.c
@@ -730,8 +730,7 @@ static __devinit int probe(int irq, struct device *dev)
 power_reg_failed_1:
        power_supply_unregister(&pbi->batt);
 power_reg_failed:
-       cancel_rearming_delayed_workqueue(pbi->monitor_wqueue,
-                                               &pbi->monitor_battery);
+       cancel_delayed_work_sync(&pbi->monitor_battery);
 requestirq_failed:
        destroy_workqueue(pbi->monitor_wqueue);
 wqueue_failed:
@@ -760,14 +759,13 @@ static int __devexit platform_pmic_battery_remove(struct platform_device *pdev)
        struct pmic_power_module_info *pbi = dev_get_drvdata(&pdev->dev);
 
        free_irq(pbi->irq, pbi);
-       cancel_rearming_delayed_workqueue(pbi->monitor_wqueue,
-                                       &pbi->monitor_battery);
+       cancel_delayed_work_sync(&pbi->monitor_battery);
        destroy_workqueue(pbi->monitor_wqueue);
 
        power_supply_unregister(&pbi->usb);
        power_supply_unregister(&pbi->batt);
 
-       flush_scheduled_work();
+       cancel_work_sync(&pbi->handler);
        kfree(pbi);
        return 0;
 }