diff options
| author | Mark Brown <broonie@kernel.org> | 2020-06-01 13:01:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-06-01 13:01:44 +0100 |
| commit | 5fb565b69dabd5a256fc116702331b54a4621dc9 (patch) | |
| tree | 55c3cd9ba11101f9c2e3b6789d0b4d87f91e0732 /drivers/regulator/tps80031-regulator.c | |
| parent | cc58045486d0f938662b01025c855fd4aea89ea6 (diff) | |
| parent | 0b0c0bd818ef76a20f58c3cb1ac96a3056ccb681 (diff) | |
Merge remote-tracking branch 'regulator/for-5.8' into regulator-linus
Diffstat (limited to 'drivers/regulator/tps80031-regulator.c')
| -rw-r--r-- | drivers/regulator/tps80031-regulator.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/regulator/tps80031-regulator.c b/drivers/regulator/tps80031-regulator.c index 85a6a8ca8c1b..a29e65230132 100644 --- a/drivers/regulator/tps80031-regulator.c +++ b/drivers/regulator/tps80031-regulator.c @@ -271,7 +271,7 @@ static int tps80031_vbus_is_enabled(struct regulator_dev *rdev) { struct tps80031_regulator *ri = rdev_get_drvdata(rdev); struct device *parent = to_tps80031_dev(rdev); - int ret = -EIO; + int ret; uint8_t ctrl1 = 0; uint8_t ctrl3 = 0; @@ -322,7 +322,7 @@ static int tps80031_vbus_disable(struct regulator_dev *rdev) { struct tps80031_regulator *ri = rdev_get_drvdata(rdev); struct device *parent = to_tps80031_dev(rdev); - int ret = 0; + int ret; if (ri->config_flags & TPS80031_VBUS_DISCHRG_EN_PDN) { ret = tps80031_write(parent, TPS80031_SLAVE_ID2, @@ -530,7 +530,8 @@ static int tps80031_regulator_config(struct device *parent, case TPS80031_REGULATOR_LDOUSB: if (ri->config_flags & (TPS80031_USBLDO_INPUT_VSYS | TPS80031_USBLDO_INPUT_PMID)) { - unsigned val = 0; + unsigned val; + if (ri->config_flags & TPS80031_USBLDO_INPUT_VSYS) val = MISC2_LDOUSB_IN_VSYS; else |