watchdog: at91sam9_wdt: use devm_request_irq to avoid missing free_irq() in error...
authorruanjinjie <ruanjinjie@huawei.com>
Wed, 16 Nov 2022 09:49:50 +0000 (17:49 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 11 Mar 2023 12:55:23 +0000 (13:55 +0100)
[ Upstream commit 07bec0e09c1afbab4c5674fd2341f4f52d594f30 ]

free_irq() is missing in case of error in at91_wdt_init(), use
devm_request_irq to fix that.

Fixes: 5161b31dc39a ("watchdog: at91sam9_wdt: better watchdog support")
Signed-off-by: ruanjinjie <ruanjinjie@huawei.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20221116094950.3141943-1-ruanjinjie@huawei.com
[groeck: Adjust multi-line alignment]
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/watchdog/at91sam9_wdt.c

index 292b5a1..fed7be2 100644 (file)
@@ -206,10 +206,9 @@ static int at91_wdt_init(struct platform_device *pdev, struct at91wdt *wdt)
                         "min heartbeat and max heartbeat might be too close for the system to handle it correctly\n");
 
        if ((tmp & AT91_WDT_WDFIEN) && wdt->irq) {
-               err = request_irq(wdt->irq, wdt_interrupt,
-                                 IRQF_SHARED | IRQF_IRQPOLL |
-                                 IRQF_NO_SUSPEND,
-                                 pdev->name, wdt);
+               err = devm_request_irq(dev, wdt->irq, wdt_interrupt,
+                                      IRQF_SHARED | IRQF_IRQPOLL | IRQF_NO_SUSPEND,
+                                      pdev->name, wdt);
                if (err)
                        return err;
        }