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

* git://git.infradead.org/battery-2.6: (21 commits)
  power_supply: Add MAX17042 Fuel Gauge Driver
  olpc_battery: Fix up XO-1.5 properties list
  olpc_battery: Add support for CURRENT_NOW and VOLTAGE_NOW
  olpc_battery: Add support for CHARGE_NOW
  olpc_battery: Add support for CHARGE_FULL_DESIGN
  olpc_battery: Ambient temperature is not available on XO-1.5
  jz4740-battery: Should include linux/io.h
  s3c_adc_battery: Add gpio_inverted field to pdata
  power_supply: Don't use flush_scheduled_work()
  power_supply: Fix use after free and memory leak
  gpio-charger: Fix potential race between irq handler and probe/remove
  gpio-charger: Provide default name for the power_supply
  gpio-charger: Check result of kzalloc
  jz4740-battery: Check if platform_data is supplied
  isp1704_charger: Detect charger after probe
  isp1704_charger: Set isp->dev before anything needs it
  isp1704_charger: Detect HUB/Host chargers
  isp1704_charger: Correct length for storing model
  power_supply: Add gpio charger driver
  jz4740-battery: Protect against concurrent battery readings
  ...

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/power/collie_battery.c b/drivers/power/collie_battery.c
index 039f41ae217d..548d263b1ad0 100644
--- a/drivers/power/collie_battery.c
+++ b/drivers/power/collie_battery.c
@@ -295,7 +295,7 @@ static struct {
 static int collie_bat_suspend(struct ucb1x00_dev *dev, pm_message_t state)
 {
         /* flush all pending status updates */
-        flush_scheduled_work();
+        flush_work_sync(&bat_work);
         return 0;
 }
 
@@ -362,7 +362,7 @@ err_psy_reg_bu:
 err_psy_reg_main:
 
         /* see comment in collie_bat_remove */
-        flush_scheduled_work();
+        cancel_work_sync(&bat_work);
 
         i--;
 err_gpio:
@@ -382,12 +382,11 @@ static void __devexit collie_bat_remove(struct ucb1x00_dev *dev)
         power_supply_unregister(&collie_bat_main.psy);
 
         /*
-         * now flush all pending work.
-         * we won't get any more schedules, since all
-         * sources (isr and external_power_changed)
-         * are unregistered now.
+         * Now cancel the bat_work.  We won't get any more schedules,
+         * since all sources (isr and external_power_changed) are
+         * unregistered now.
          */
-        flush_scheduled_work();
+        cancel_work_sync(&bat_work);
 
         for (i = ARRAY_SIZE(gpios) - 1; i >= 0; i--)
                 gpio_free(gpios[i].gpio);