summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorAbhijeet Dharmapurikar <adharmap@codeaurora.org>2016-10-18 10:37:23 -0700
committerAbhijeet Dharmapurikar <adharmap@codeaurora.org>2016-10-19 16:27:03 -0700
commit712057c95d252758698ca9a778c7dc8810f8019a (patch)
treeddffffe01ed45763bbf8c6c7bfc3f4aa8c02a535 /drivers/power
parentfa2d8c0cfae0b2130b4e19a843782e08b5745287 (diff)
qpnp-smb2: Fix LIMITED reporting
A merge conflict resolution caused a break statement to be dropped in the case block for reporting input_current_limited property. Fix this. Change-Id: Ic5c9626628f05f3167f9f8d0b78b04b83446f413 Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/qcom-charger/qpnp-smb2.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/qcom-charger/qpnp-smb2.c b/drivers/power/qcom-charger/qpnp-smb2.c
index f3b76f130cde..d5dbd6374ace 100644
--- a/drivers/power/qcom-charger/qpnp-smb2.c
+++ b/drivers/power/qcom-charger/qpnp-smb2.c
@@ -680,6 +680,7 @@ static int smb2_batt_get_prop(struct power_supply *psy,
break;
case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMITED:
rc = smblib_get_prop_input_current_limited(chg, val);
+ break;
case POWER_SUPPLY_PROP_STEP_CHARGING_ENABLED:
val->intval = chg->step_chg_enabled;
break;