aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-01-17 08:40:32 -0500
committerLee Jones <lee.jones@linaro.org>2013-01-23 06:33:05 -0500
commit3edebfcdb31e6203abe0994c1e785833d928e8b4 (patch)
treeaf74987a2b965cf4ee651bcadcd68bc58f870313 /drivers/power
parente6aac611b86956bdd981f30e8862ee2ac8aaf664 (diff)
ab8500-charger: Kick watchdog
Kicks the watchdog so charging will not stop. Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/abx500_chargalg.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c
index 78b623572b52..830b2dd7ac6d 100644
--- a/drivers/power/abx500_chargalg.c
+++ b/drivers/power/abx500_chargalg.c
@@ -603,6 +603,8 @@ static void abx500_chargalg_hold_charging(struct abx500_chargalg *di)
603static void abx500_chargalg_start_charging(struct abx500_chargalg *di, 603static void abx500_chargalg_start_charging(struct abx500_chargalg *di,
604 int vset, int iset) 604 int vset, int iset)
605{ 605{
606 bool start_chargalg_wd = true;
607
606 switch (di->chg_info.charger_type) { 608 switch (di->chg_info.charger_type) {
607 case AC_CHG: 609 case AC_CHG:
608 dev_dbg(di->dev, 610 dev_dbg(di->dev,
@@ -620,8 +622,12 @@ static void abx500_chargalg_start_charging(struct abx500_chargalg *di,
620 622
621 default: 623 default:
622 dev_err(di->dev, "Unknown charger to charge from\n"); 624 dev_err(di->dev, "Unknown charger to charge from\n");
625 start_chargalg_wd = false;
623 break; 626 break;
624 } 627 }
628
629 if (start_chargalg_wd && !delayed_work_pending(&di->chargalg_wd_work))
630 queue_delayed_work(di->chargalg_wq, &di->chargalg_wd_work, 0);
625} 631}
626 632
627/** 633/**