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

Commit ac6edd6f authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Greg Kroah-Hartman
Browse files

mfd: mc13xxx: Add check for mc13xxx_irq_request 



[ Upstream commit e477e51a41cb5d6034f3c5ea85a71ad4613996b9 ]

As the potential failure of the devm_request_threaded_irq(),
it should be better to check the return value of the
mc13xxx_irq_request() and return error if fails.

Fixes: 8e005935 ("mfd: Add mc13892 support to mc13xxx")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20220224022331.3208275-1-jiasheng@iscas.ac.cn


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d2577dc2

drivers/mfd/mc13xxx-core.c

+3 −1
Original line number Diff line number Diff line
@@ -323,8 +323,10 @@ int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx, unsigned int mode, 
		adc1 |= MC13783_ADC1_ATOX;



	dev_dbg(mc13xxx->dev, "%s: request irq\n", __func__);

	mc13xxx_irq_request(mc13xxx, MC13XXX_IRQ_ADCDONE,

	ret = mc13xxx_irq_request(mc13xxx, MC13XXX_IRQ_ADCDONE,

			mc13xxx_handler_adcdone, __func__, &adcdone_data);

	if (ret)

		goto out;



	mc13xxx_reg_write(mc13xxx, MC13XXX_ADC0, adc0);

	mc13xxx_reg_write(mc13xxx, MC13XXX_ADC1, adc1);