watchdog: ep93xx_wdt: Fix timeout after conversion to watchdog core
authorMika Westerberg <mika.westerberg@iki.fi>
Sun, 18 Mar 2012 11:09:52 +0000 (13:09 +0200)
committerWim Van Sebroeck <wim@iguana.be>
Tue, 27 Mar 2012 18:15:17 +0000 (20:15 +0200)
After the conversion of this driver to the watchdog core, I noticed that we
miss setting the initial timeout of the wdt device.
This results in a failure of the WDIOC_GETTIMEOUT ioctl call.

Reviewed-by: Mika Westerberg <mika.westerberg@iki.fi>
Tested-by: Mika Westerberg <mika.westerberg@iki.fi>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/ep93xx_wdt.c

index 414ce8fdecc927047c758795605c31f84be589d8..29575f8228bd3a91a4ee438f9e2d9e4ab758e1ff 100644 (file)
@@ -139,6 +139,7 @@ static int __devinit ep93xx_wdt_probe(struct platform_device *pdev)
 
        val = readl(mmio_base + EP93XX_WATCHDOG);
        ep93xx_wdt_wdd.bootstatus = (val & 0x01) ? WDIOF_CARDRESET : 0;
+       ep93xx_wdt_wdd.timeout = timeout;
 
        watchdog_set_nowayout(&ep93xx_wdt_wdd, nowayout);