Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f98bcfad authored by Kangjie Lu's avatar Kangjie Lu Committed by Greg Kroah-Hartman
Browse files

mfd: mc13xxx: Fix a missing check of a register-read failure 



[ Upstream commit 9e28989d41c0eab57ec0bb156617a8757406ff8a ]

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: default avatarKangjie Lu <kjlu@umn.edu>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 33e081e8

drivers/mfd/mc13xxx-core.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

	adc1 = MC13XXX_ADC1_ADEN | MC13XXX_ADC1_ADTRIGIGN | MC13XXX_ADC1_ASC;