---

yaml --- r: 350635 b: refs/heads/master c: 3edebfc h: refs/heads/master i: 350633: 8917376 350631: 24d6694 v: v3
git-mirror · Jan 23, 2013 · e5133f5 · e5133f5
1 parent 804662c
commit e5133f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6aac611b86956bdd981f30e8862ee2ac8aaf664
+refs/heads/master: 3edebfcdb31e6203abe0994c1e785833d928e8b4
diff --git a/trunk/drivers/power/abx500_chargalg.c b/trunk/drivers/power/abx500_chargalg.c
@@ -603,6 +603,8 @@ static void abx500_chargalg_hold_charging(struct abx500_chargalg *di)
 static void abx500_chargalg_start_charging(struct abx500_chargalg *di,
 	int vset, int iset)
 {
+	bool start_chargalg_wd = true;
+
 	switch (di->chg_info.charger_type) {
 	case AC_CHG:
 		dev_dbg(di->dev,
@@ -620,8 +622,12 @@ static void abx500_chargalg_start_charging(struct abx500_chargalg *di,
 
 	default:
 		dev_err(di->dev, "Unknown charger to charge from\n");
+		start_chargalg_wd = false;
 		break;
 	}
+
+	if (start_chargalg_wd && !delayed_work_pending(&di->chargalg_wd_work))
+		queue_delayed_work(di->chargalg_wq, &di->chargalg_wd_work, 0);
 }
 
 /**