diff options
Diffstat (limited to 'drivers/power')
-rw-r--r-- | drivers/power/collie_battery.c | 2 | ||||
-rw-r--r-- | drivers/power/tosa_battery.c | 2 | ||||
-rw-r--r-- | drivers/power/wm97xx_battery.c | 2 | ||||
-rw-r--r-- | drivers/power/z2_battery.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/power/collie_battery.c b/drivers/power/collie_battery.c index 74c6b23aeabf..b19bfe400f8c 100644 --- a/drivers/power/collie_battery.c +++ b/drivers/power/collie_battery.c | |||
@@ -290,7 +290,7 @@ static struct gpio collie_batt_gpios[] = { | |||
290 | static int collie_bat_suspend(struct ucb1x00_dev *dev, pm_message_t state) | 290 | static int collie_bat_suspend(struct ucb1x00_dev *dev, pm_message_t state) |
291 | { | 291 | { |
292 | /* flush all pending status updates */ | 292 | /* flush all pending status updates */ |
293 | flush_work_sync(&bat_work); | 293 | flush_work(&bat_work); |
294 | return 0; | 294 | return 0; |
295 | } | 295 | } |
296 | 296 | ||
diff --git a/drivers/power/tosa_battery.c b/drivers/power/tosa_battery.c index 28bbe7e094e3..51199b5ce221 100644 --- a/drivers/power/tosa_battery.c +++ b/drivers/power/tosa_battery.c | |||
@@ -327,7 +327,7 @@ static struct gpio tosa_bat_gpios[] = { | |||
327 | static int tosa_bat_suspend(struct platform_device *dev, pm_message_t state) | 327 | static int tosa_bat_suspend(struct platform_device *dev, pm_message_t state) |
328 | { | 328 | { |
329 | /* flush all pending status updates */ | 329 | /* flush all pending status updates */ |
330 | flush_work_sync(&bat_work); | 330 | flush_work(&bat_work); |
331 | return 0; | 331 | return 0; |
332 | } | 332 | } |
333 | 333 | ||
diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c index d2d4c08c681c..1245fe1f48c3 100644 --- a/drivers/power/wm97xx_battery.c +++ b/drivers/power/wm97xx_battery.c | |||
@@ -146,7 +146,7 @@ static irqreturn_t wm97xx_chrg_irq(int irq, void *data) | |||
146 | #ifdef CONFIG_PM | 146 | #ifdef CONFIG_PM |
147 | static int wm97xx_bat_suspend(struct device *dev) | 147 | static int wm97xx_bat_suspend(struct device *dev) |
148 | { | 148 | { |
149 | flush_work_sync(&bat_work); | 149 | flush_work(&bat_work); |
150 | return 0; | 150 | return 0; |
151 | } | 151 | } |
152 | 152 | ||
diff --git a/drivers/power/z2_battery.c b/drivers/power/z2_battery.c index 8c9a607ea77a..5757d0d6782f 100644 --- a/drivers/power/z2_battery.c +++ b/drivers/power/z2_battery.c | |||
@@ -276,7 +276,7 @@ static int z2_batt_suspend(struct device *dev) | |||
276 | struct i2c_client *client = to_i2c_client(dev); | 276 | struct i2c_client *client = to_i2c_client(dev); |
277 | struct z2_charger *charger = i2c_get_clientdata(client); | 277 | struct z2_charger *charger = i2c_get_clientdata(client); |
278 | 278 | ||
279 | flush_work_sync(&charger->bat_work); | 279 | flush_work(&charger->bat_work); |
280 | return 0; | 280 | return 0; |
281 | } | 281 | } |
282 | 282 | ||