diff mbox

[24/40] abx500-chargalg: Prevent the watchdog from being kicked twice

Message ID 1360932310-30065-25-git-send-email-lee.jones@linaro.org
State Accepted
Commit eaded808c9f9f36d95b5b7fe195ab1839e9e486c
Headers show

Commit Message

Lee Jones Feb. 15, 2013, 12:44 p.m. UTC 
Charging watchdog kicker work-thread gets started twice causing
'failed to kick watchdog' message after removing charger and
when re-inserting charger. This patch removes the superfluous
start of watchdog kicker-thread.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/power/abx500_chargalg.c |    6 ------
 1 file changed, 6 deletions(-)
diff mbox

Patch

diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c
index a9b8efd..e23b92a 100644
--- a/drivers/power/abx500_chargalg.c
+++ b/drivers/power/abx500_chargalg.c
@@ -689,8 +689,6 @@  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,
@@ -708,12 +706,8 @@  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);
 }
 
 /**