[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Nelson Castillo]

The following commit has been merged in the andy-tracking branch:
commit 5b8138ba5c1dbc86dce264a0d4c078737aa2007a
Author: Michael Trimarchi <trimarchi at gandalf.sssup.it>
Date:   Sat May 23 17:54:00 2009 -0300

    Improve battery status notification
    
    This patch adds a call to cancel_delayed_work before a call
    to schedule_delayed_work.
    
    Signed-off-by: Michael Trimarchi <michael at panicking.kicks-ass.org>
    Signed-off-by: Daniel Willmann <daniel at totalueberwachung.de>

diff --git a/drivers/power/bq27000_battery.c b/drivers/power/bq27000_battery.c
index 9f0f1a9..7e8b3f8 100644
--- a/drivers/power/bq27000_battery.c
+++ b/drivers/power/bq27000_battery.c
@@ -170,9 +170,11 @@ static int hdq_read16(struct bq27000_device_info *di, int address)
 
 static void bq27000_battery_external_power_changed(struct power_supply *psy)
 {
-	struct bq27000_device_info *di = container_of(psy, struct bq27000_device_info, bat);
+	struct bq27000_device_info *di =
+		container_of(psy, struct bq27000_device_info, bat);
 
 	dev_dbg(di->dev, "%s\n", __FUNCTION__);
+	cancel_delayed_work(&di->work);
 	schedule_delayed_work(&di->work, 0);
 }
 

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko