summaryrefslogtreecommitdiffstats
path: root/drivers/power/charger-manager.c
diff options
context:
space:
mode:
authorChanwoo Choi <cw00.choi@samsung.com>2012-07-27 14:01:34 +0900
committerAnton Vorontsov <anton.vorontsov@linaro.org>2012-08-22 20:08:28 -0700
commitdbb61fc7452632a4225b2fe3719b6c2d1306e257 (patch)
tree9104ac5f913221c52052431245bdbf3902345bae /drivers/power/charger-manager.c
parentc084e092e47ca2435673702c6cf6e87a731ecc6f (diff)
downloadblackbird-obmc-linux-dbb61fc7452632a4225b2fe3719b6c2d1306e257.tar.gz
blackbird-obmc-linux-dbb61fc7452632a4225b2fe3719b6c2d1306e257.zip
charger-manager: Disable regulator when charger cable is detached
This patch disable regulator for charging when charger cable is detached before stopping charging forcibly on abnormal battery state and check return value of regulator_enable/disable() function to confirm correct operation of enabling or disabling regulator for charging. Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Myungjoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'drivers/power/charger-manager.c')
-rw-r--r--drivers/power/charger-manager.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index 526e5c931294..240de49934f1 100644
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c
@@ -271,9 +271,24 @@ static int try_charger_enable(struct charger_manager *cm, bool enable)
if (enable) {
if (cm->emergency_stop)
return -EAGAIN;
- for (i = 0 ; i < desc->num_charger_regulators ; i++)
- regulator_enable(desc->charger_regulators[i].consumer);
+ for (i = 0 ; i < desc->num_charger_regulators ; i++) {
+ err = regulator_enable(desc->charger_regulators[i].consumer);
+ if (err < 0) {
+ dev_warn(cm->dev,
+ "Cannot enable %s regulator\n",
+ desc->charger_regulators[i].regulator_name);
+ }
+ }
} else {
+ for (i = 0 ; i < desc->num_charger_regulators ; i++) {
+ err = regulator_disable(desc->charger_regulators[i].consumer);
+ if (err < 0) {
+ dev_warn(cm->dev,
+ "Cannot disable %s regulator\n",
+ desc->charger_regulators[i].regulator_name);
+ }
+ }
+
/*
* Abnormal battery state - Stop charging forcibly,
* even if charger was enabled at the other places
OpenPOWER on IntegriCloud