evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "smb-lib: fix Type-C detection after sink removal"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-21 05:01:24 -08:00 • committed by Gerrit - the friendly Code Review server
commit c13aae3157
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/power/supply/qcom/smb-lib.c
View file

@ -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;
}
}