[added to the 4.1 stable tree] rtc: max77686: Properly handle regmap_irq_get_virq() error code
From: Sasha Levin <hidden>
Date: 2016-07-12 02:59:14
Subsystem:
maxim pmic and muic drivers for exynos based boards, real time clock (rtc) subsystem, the rest · Maintainers:
Chanwoo Choi, Krzysztof Kozlowski, Alexandre Belloni, Linus Torvalds
From: Krzysztof Kozlowski <redacted>
This patch has been added to the 4.1 stable tree. If you have any
objections, please let us know.
===============
[ Upstream commit fb166ba1d7f0a662f7332f4ff660a0d6f4d76915 ]
The regmap_irq_get_virq() can return 0 or -EINVAL in error conditions
but driver checked only for value of 0.
This could lead to a cast of -EINVAL to an unsigned int used as a
interrupt number for devm_request_threaded_irq(). Although this is not
yet fatal (devm_request_threaded_irq() will just fail with -EINVAL) but
might be a misleading when diagnosing errors.
Signed-off-by: Krzysztof Kozlowski <redacted>
Fixes: 6f1c1e71d933 ("mfd: max77686: Convert to use regmap_irq")
Reviewed-by: Javier Martinez Canillas <redacted>
Signed-off-by: Alexandre Belloni <redacted>
Signed-off-by: Sasha Levin <redacted>
---
drivers/rtc/rtc-max77686.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/rtc/rtc-max77686.c b/drivers/rtc/rtc-max77686.c
index 7632a87..d42cef0 100644
--- a/drivers/rtc/rtc-max77686.c
+++ b/drivers/rtc/rtc-max77686.c@@ -465,7 +465,7 @@ static int max77686_rtc_probe(struct platform_device *pdev) info->virq = regmap_irq_get_virq(max77686->rtc_irq_data, MAX77686_RTCIRQ_RTCA1); - if (!info->virq) { + if (info->virq <= 0) { ret = -ENXIO; goto err_rtc; }
--
2.5.0