diff options
| author | Lee Jones <lee.jones@linaro.org> | 2013-02-13 13:38:00 +0000 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2013-03-07 12:35:49 +0800 |
| commit | eaded808c9f9f36d95b5b7fe195ab1839e9e486c (patch) | |
| tree | eaa1cc3ebb1fb372ac8c45520eb231da606399a8 | |
| parent | 88efdb8022f13c198fe4459e6e278f9b559cff3b (diff) | |
| download | linux-eaded808c9f9f36d95b5b7fe195ab1839e9e486c.tar.gz linux-eaded808c9f9f36d95b5b7fe195ab1839e9e486c.tar.bz2 linux-eaded808c9f9f36d95b5b7fe195ab1839e9e486c.zip | |
abx500-chargalg: Prevent the watchdog from being kicked twice
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>
| -rw-r--r-- | drivers/power/abx500_chargalg.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c index a9b8efdafb8f..e23b92a5332e 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); } /** |