summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiasheng Jiang <jiasheng@iscas.ac.cn>2022-02-24 10:23:31 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-04-20 09:08:18 +0200
commitf9a945d8058ff84fb6408421aa5c0d2746daafce (patch)
tree5e0928806ee69c56f9baae1b3b8618f920ae2a42
parent9aeea41fa6cdb3b009585182314f1bd93e0dd1c3 (diff)
downloadlinux-stable-f9a945d8058ff84fb6408421aa5c0d2746daafce.tar.gz
linux-stable-f9a945d8058ff84fb6408421aa5c0d2746daafce.tar.bz2
linux-stable-f9a945d8058ff84fb6408421aa5c0d2746daafce.zip
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: 8e00593557c3 ("mfd: Add mc13892 support to mc13xxx") Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> Signed-off-by: Lee Jones <lee.jones@linaro.org> Link: https://lore.kernel.org/r/20220224022331.3208275-1-jiasheng@iscas.ac.cn Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/mfd/mc13xxx-core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
index 75d52034f89d..5b4faebdcae2 100644
--- a/drivers/mfd/mc13xxx-core.c
+++ b/drivers/mfd/mc13xxx-core.c
@@ -313,8 +313,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);