From 2afef33ef6489b9e00ccb60d63fade507fdb9ab0 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Wed, 13 Feb 2013 13:38:00 +0000 Subject: [PATCH] --- yaml --- r: 367476 b: refs/heads/master c: eaded808c9f9f36d95b5b7fe195ab1839e9e486c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/power/abx500_chargalg.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ffda61ef6b9b..7195d914f0c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88efdb8022f13c198fe4459e6e278f9b559cff3b +refs/heads/master: eaded808c9f9f36d95b5b7fe195ab1839e9e486c diff --git a/trunk/drivers/power/abx500_chargalg.c b/trunk/drivers/power/abx500_chargalg.c index a9b8efdafb8f..e23b92a5332e 100644 --- a/trunk/drivers/power/abx500_chargalg.c +++ b/trunk/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); } /**