ata: libata-core: fetch sense data for successful commands iff CDL enabled

[linux-2.6-block.git] / drivers / watchdog / at91sam9_wdt.c

diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 292b5a1ca8318a50040957f68effe0685095530b..fed7be24644209919bcbfd0332e294dbd62c44db 100644 (file)
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -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;
        }