---

yaml --- r: 283450 b: refs/heads/master c: 8cfaaa8 h: refs/heads/master v: v3
git-mirror · Nov 25, 2011 · 66baa4c · 66baa4c
1 parent ec0cb62
commit 66baa4c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6cd4f267d442f2ce279024adb03a69e8608e0f6
+refs/heads/master: 8cfaaa811894a3ae2d7360a15a6cfccff3ebc7db
diff --git a/trunk/drivers/power/bq27x00_battery.c b/trunk/drivers/power/bq27x00_battery.c
@@ -598,6 +598,14 @@ static int bq27x00_powersupply_init(struct bq27x00_device_info *di)
 
 static void bq27x00_powersupply_unregister(struct bq27x00_device_info *di)
 {
+	/*
+	 * power_supply_unregister call bq27x00_battery_get_property which
+	 * call bq27x00_battery_poll.
+	 * Make sure that bq27x00_battery_poll will not call
+	 * schedule_delayed_work again after unregister (which cause OOPS).
+	 */
+	poll_interval = 0;
+
 	cancel_delayed_work_sync(&di->work);
 
 	power_supply_unregister(&di->bat);