diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2018-02-07 08:41:44 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-02-07 08:41:44 -0800 |
| commit | 645d6ad33ca063a0a42e60fbc43430f365c2a896 (patch) | |
| tree | 6cf5c4728bb2fe7876891705310dd2008fb9b266 | |
| parent | f5c9996a312dba0ec2c9af9f70f84b133ad7b209 (diff) | |
| parent | 4443d763c3bf2227d2484c61b6c5fc81da0f88c5 (diff) | |
Merge "power: smb1351-charger: Fix check in shutdown path for parallel disable"
| -rw-r--r-- | drivers/power/supply/qcom/smb1351-charger.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/supply/qcom/smb1351-charger.c b/drivers/power/supply/qcom/smb1351-charger.c index 0283396c26e0..55852a1ef9bd 100644 --- a/drivers/power/supply/qcom/smb1351-charger.c +++ b/drivers/power/supply/qcom/smb1351-charger.c @@ -3268,7 +3268,7 @@ static void smb1351_charger_shutdown(struct i2c_client *client) { struct smb1351_charger *chip = i2c_get_clientdata(client); - if (chip->chg_present) + if (!chip->parallel_charger_suspended) smb1351_usb_suspend(chip, USER, true); } |