diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-09-25 20:52:51 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-09-25 20:52:51 -0700 |
| commit | 46c0ea4e457386c0ce645a3bd19bcf37999b9317 (patch) | |
| tree | 9e57c8ff1d5ff42b33acd67269ac2cbb1940abbf /drivers/power | |
| parent | fa33f6bd9a2f2c62703ae7b6d3056edb03537ba6 (diff) | |
| parent | eab089bd20bf15aa4eb939877d90d6345c898e0b (diff) | |
Merge "smb-lib: allow reading vbus without presence"
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/qcom/smb-lib.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/power/supply/qcom/smb-lib.c b/drivers/power/supply/qcom/smb-lib.c index b3c2b67abfde..b1e9ad72a07e 100644 --- a/drivers/power/supply/qcom/smb-lib.c +++ b/drivers/power/supply/qcom/smb-lib.c @@ -2224,12 +2224,6 @@ int smblib_get_prop_usb_voltage_max(struct smb_charger *chg, int smblib_get_prop_usb_voltage_now(struct smb_charger *chg, union power_supply_propval *val) { - int rc = 0; - - rc = smblib_get_prop_usb_present(chg, val); - if (rc < 0 || !val->intval) - return rc; - if (!chg->iio.usbin_v_chan || PTR_ERR(chg->iio.usbin_v_chan) == -EPROBE_DEFER) chg->iio.usbin_v_chan = iio_channel_get(chg->dev, "usbin_v"); |