2022-03-03 09:18:07

by Jiasheng Jiang

Subject: [PATCH] rtc: rtc-wm8350: Handle error for wm8350_register_irq

As the potential failure of the wm8350_register_irq(),
it should be better to check it and return error if fails.
Also, it need not free 'wm_rtc->rtc' since it will be freed
automatically.

Fixes: 077eaf5b40ec ("rtc: rtc-wm8350: add support for WM8350 RTC")
Signed-off-by: Jiasheng Jiang <[email protected]>
---
drivers/rtc/rtc-wm8350.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/rtc/rtc-wm8350.c b/drivers/rtc/rtc-wm8350.c
index 2018614f258f..6eaa9321c074 100644
--- a/drivers/rtc/rtc-wm8350.c
+++ b/drivers/rtc/rtc-wm8350.c
@@ -432,14 +432,21 @@ static int wm8350_rtc_probe(struct platform_device *pdev)
return ret;
}

- wm8350_register_irq(wm8350, WM8350_IRQ_RTC_SEC,
+ ret = wm8350_register_irq(wm8350, WM8350_IRQ_RTC_SEC,
wm8350_rtc_update_handler, 0,
"RTC Seconds", wm8350);
+ if (ret)
+ return ret;
+
wm8350_mask_irq(wm8350, WM8350_IRQ_RTC_SEC);

- wm8350_register_irq(wm8350, WM8350_IRQ_RTC_ALM,
+ ret = wm8350_register_irq(wm8350, WM8350_IRQ_RTC_ALM,
wm8350_rtc_alarm_handler, 0,
"RTC Alarm", wm8350);
+ if (ret) {
+ wm8350_free_irq(wm8350, WM8350_IRQ_RTC_SEC, wm8350);
+ return ret;
+ }

return 0;
}
--
2.25.1

2022-03-03 14:02:04

by Charles Keepax

Subject: Re: [PATCH] rtc: rtc-wm8350: Handle error for wm8350_register_irq

On Thu, Mar 03, 2022 at 04:50:30PM +0800, Jiasheng Jiang wrote:
> As the potential failure of the wm8350_register_irq(),
> it should be better to check it and return error if fails.
> Also, it need not free 'wm_rtc->rtc' since it will be freed
> automatically.
>
> Fixes: 077eaf5b40ec ("rtc: rtc-wm8350: add support for WM8350 RTC")
> Signed-off-by: Jiasheng Jiang <[email protected]>
> ---

Acked-by: Charles Keepax <[email protected]>

Thanks,
Charles

2022-03-09 02:22:39

by Alexandre Belloni

Subject: Re: [PATCH] rtc: rtc-wm8350: Handle error for wm8350_register_irq

On Thu, 3 Mar 2022 16:50:30 +0800, Jiasheng Jiang wrote:
> As the potential failure of the wm8350_register_irq(),
> it should be better to check it and return error if fails.
> Also, it need not free 'wm_rtc->rtc' since it will be freed
> automatically.
>
>

Applied, thanks!

[1/1] rtc: rtc-wm8350: Handle error for wm8350_register_irq
commit: 5e086367298dfaa1617885e797c8a58873365f03

Best regards,
--
Alexandre Belloni <[email protected]>