diff options
| author | Kangjie Lu <kjlu@umn.edu> | 2018-12-21 00:29:19 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-05 15:34:50 +0100 |
| commit | e914a7747a531934bd878d7ec8857d5095c4b156 (patch) | |
| tree | bc1bfa7d0cf991e968a28f144a593a7fe3334efb | |
| parent | 542bb9b734918334d9448272a52aa2766711b732 (diff) | |
| download | linux-stable-e914a7747a531934bd878d7ec8857d5095c4b156.tar.gz linux-stable-e914a7747a531934bd878d7ec8857d5095c4b156.tar.bz2 linux-stable-e914a7747a531934bd878d7ec8857d5095c4b156.zip | |
regulator: tps65910: fix a missing check of return value
[ Upstream commit cd07e3701fa6a4c68f8493ee1d12caa18d46ec6a ]
tps65910_reg_set_bits() may fail. The fix checks if it fails, and if so,
returns with its error code.
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/regulator/tps65910-regulator.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c index 696116ebdf50..9cde7b075701 100644 --- a/drivers/regulator/tps65910-regulator.c +++ b/drivers/regulator/tps65910-regulator.c @@ -1102,8 +1102,10 @@ static int tps65910_probe(struct platform_device *pdev) platform_set_drvdata(pdev, pmic); /* Give control of all register to control port */ - tps65910_reg_set_bits(pmic->mfd, TPS65910_DEVCTRL, + err = tps65910_reg_set_bits(pmic->mfd, TPS65910_DEVCTRL, DEVCTRL_SR_CTL_I2C_SEL_MASK); + if (err < 0) + return err; switch (tps65910_chip_id(tps65910)) { case TPS65910: |