summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-06-27 04:28:24 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-06-27 04:28:23 -0700
commit47d50db7ee0c4325462fd61a22ed00b82891c678 (patch)
tree65255ecf0f3fc9cc7ae0e57144d3bb3e5e8b8532 /drivers
parentca79f2d777aff7f8732ee6df9bb8f6da7b963d09 (diff)
parentdd1a56d034ebfa5f96e2e68053b97c978ed8cf12 (diff)
Merge "power: qpnp-smb2: Unset ONLINE for UNKNOWN USB charger type"
Diffstat (limited to 'drivers')
-rw-r--r--drivers/power/supply/qcom/qpnp-smb2.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/power/supply/qcom/qpnp-smb2.c b/drivers/power/supply/qcom/qpnp-smb2.c
index 3faa656691aa..0908eea3b186 100644
--- a/drivers/power/supply/qcom/qpnp-smb2.c
+++ b/drivers/power/supply/qcom/qpnp-smb2.c
@@ -465,6 +465,8 @@ static int smb2_usb_get_prop(struct power_supply *psy,
val->intval = 0;
else
val->intval = 1;
+ if (chg->real_charger_type == POWER_SUPPLY_TYPE_UNKNOWN)
+ val->intval = 0;
break;
case POWER_SUPPLY_PROP_VOLTAGE_MIN:
val->intval = chg->voltage_min_uv;