diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-21 05:01:24 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-21 05:01:23 -0800 |
| commit | c13aae3157fc7b50cb22d4ddbee90fa2f01e5a83 (patch) | |
| tree | 356881f5efff00f0e83a9e6cd4b3aff78ae07068 | |
| parent | 9b0b7adacb6ff84397d8eeaebcd3fc78721ab366 (diff) | |
| parent | ba0441736d3fb21e89e681b69942198c1edddc28 (diff) | |
Merge "smb-lib: fix Type-C detection after sink removal"
| -rw-r--r-- | drivers/power/supply/qcom/smb-lib.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/power/supply/qcom/smb-lib.c b/drivers/power/supply/qcom/smb-lib.c index d3f7e43ea10e..62d8ae0c5f36 100644 --- a/drivers/power/supply/qcom/smb-lib.c +++ b/drivers/power/supply/qcom/smb-lib.c @@ -1216,11 +1216,9 @@ static int _smblib_vbus_regulator_disable(struct regulator_dev *rdev) if (!chg->external_vconn) { rc = smblib_read(chg, RID_CC_CONTROL_7_0_REG, &stat); - if (rc < 0) { + if (rc < 0) smblib_err(chg, "Couldn't read RID_CC_CONTROL_7_0 rc=%d\n", rc); - return rc; - } /* check if VCONN is enabled on either CC pin */ if (stat & VCONN_EN_CC_MASK) { @@ -1229,7 +1227,6 @@ static int _smblib_vbus_regulator_disable(struct regulator_dev *rdev) if (rc < 0) smblib_err(chg, "Couldn't disable VCONN rc=%d\n", rc); - return rc; } } |