aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorGraeme Gregory <gg@slimlogic.co.uk>2012-02-15 11:13:00 +0000
committerZiyann <jaraidaniel@gmail.com>2014-10-01 13:00:21 +0200
commitc70cd4b24efc6a1f1e10ecb7e75451c7c612f3c8 (patch)
tree25c74653c8d4750353cba9abd1925f9edcbb56db /drivers/power
parent5bd74eff4a3abda1f36c64ce2e2b8ce606a48c2c (diff)
downloadkernel_samsung_tuna-c70cd4b24efc6a1f1e10ecb7e75451c7c612f3c8.zip
kernel_samsung_tuna-c70cd4b24efc6a1f1e10ecb7e75451c7c612f3c8.tar.gz
kernel_samsung_tuna-c70cd4b24efc6a1f1e10ecb7e75451c7c612f3c8.tar.bz2
POWER: twl6030_bci_battery remember to set status Charging
Due to code being re-organised the code to set the charge_status to POWER_SUPPLY_STATUS_CHARGING is missing. This was leading to the watchdog not being kicked and charging effectively disabled. Change-Id: If7c401e1dbe01c52e7557571c9bf48fa6da94274 Signed-off-by: Graeme Gregory <gg@slimlogic.co.uk>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/twl6030_bci_battery.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/power/twl6030_bci_battery.c b/drivers/power/twl6030_bci_battery.c
index 8b6248b..48e670e 100644
--- a/drivers/power/twl6030_bci_battery.c
+++ b/drivers/power/twl6030_bci_battery.c
@@ -647,6 +647,8 @@ enable:
CONTROLLER_CTRL1);
if (ret)
goto err;
+
+ di->charge_status = POWER_SUPPLY_STATUS_CHARGING;
}
return;
err: