power_supply: Don't use flush_scheduled_work()

[deliverable/linux.git] / drivers / power / power_supply_core.c

diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index f06bad047d76ebcf674cfe4eed5b9627335dddf0..970f7335d3a7f67bade76d6fad08eb954427a949 100644 (file)
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -201,7 +201,7 @@ EXPORT_SYMBOL_GPL(power_supply_register);
 
 void power_supply_unregister(struct power_supply *psy)
 {
-       flush_scheduled_work();
+       cancel_work_sync(&psy->changed_work);
        power_supply_remove_triggers(psy);
        device_unregister(psy->dev);
 }