From 934a44b7561cb947158ba039bcc7c500cf195137 Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Fri, 27 Jul 2012 14:01:34 +0900 Subject: [PATCH] --- yaml --- r: 330486 b: refs/heads/master c: dbb61fc7452632a4225b2fe3719b6c2d1306e257 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/power/charger-manager.c | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8e21a25d6ceb..fdfbe1521cbd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c084e092e47ca2435673702c6cf6e87a731ecc6f +refs/heads/master: dbb61fc7452632a4225b2fe3719b6c2d1306e257 diff --git a/trunk/drivers/power/charger-manager.c b/trunk/drivers/power/charger-manager.c index 526e5c931294..240de49934f1 100644 --- a/trunk/drivers/power/charger-manager.c +++ b/trunk/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