From e5133f56c9e7707e048ac3ba1fd91b1371d873a0 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Thu, 17 Jan 2013 13:40:32 +0000 Subject: [PATCH] --- yaml --- r: 350635 b: refs/heads/master c: 3edebfcdb31e6203abe0994c1e785833d928e8b4 h: refs/heads/master i: 350633: 891737654715b179fc8865dbaaabaa8e16ca03c2 350631: 24d6694afcc84372f09ef687139df195209f5f17 v: v3 --- [refs] | 2 +- trunk/drivers/power/abx500_chargalg.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cb6ee30ddd24..cf73e2ec3c8b 100644 --- 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 index 78b623572b52..830b2dd7ac6d 100644 --- 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); } /**