diff options
| author |   Kangjie Lu <kjlu@umn.edu> | 2018-12-20 15:12:11 -0600 |
|---|---|---|
| committer |   Lee Jones <lee.jones@linaro.org> | 2019-01-03 08:32:42 +0000 |
| commit | 9e28989d41c0eab57ec0bb156617a8757406ff8a (patch) | |
| tree | ab5f7df3b3e29b46f3ae67093d1047a60122972b /drivers/mfd/mc13xxx-core.c | |
| parent | mfd: cros_ec: Add commands to control codec (diff) | |
| download | linux-dev-9e28989d41c0eab57ec0bb156617a8757406ff8a.tar.xz linux-dev-9e28989d41c0eab57ec0bb156617a8757406ff8a.zip | |
mfd: mc13xxx: Fix a missing check of a register-read failure
When mc13xxx_reg_read() fails, "old_adc0" is uninitialized and will
contain random value. Further execution uses "old_adc0" even when
mc13xxx_reg_read() fails.
The fix checks the return value of mc13xxx_reg_read(), and exits
the execution when it fails.
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/mc13xxx-core.c')
| -rw-r--r-- | drivers/mfd/mc13xxx-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c index f475e848252f..d0bf50e3568d 100644 --- a/drivers/mfd/mc13xxx-core.c +++ b/drivers/mfd/mc13xxx-core.c @@ -274,7 +274,9 @@ int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx, unsigned int mode, mc13xxx->adcflags |= MC13XXX_ADC_WORKING; - mc13xxx_reg_read(mc13xxx, MC13XXX_ADC0, &old_adc0); + ret = mc13xxx_reg_read(mc13xxx, MC13XXX_ADC0, &old_adc0); + if (ret) + goto out; adc0 = MC13XXX_ADC0_ADINC1 | MC13XXX_ADC0_ADINC2 | MC13XXX_ADC0_CHRGRAWDIV; |