From: Mika Westerberg <mika.westerberg@iki.fi>
Date: Sun, 18 Mar 2012 11:09:52 +0000 (+0200)
Subject: watchdog: ep93xx_wdt: Fix timeout after conversion to watchdog core
X-Git-Tag: firefly_0821_release~3680^2~3228^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=59dcf1eb1a4b15610c68a4dbb7430d61a65f4af3;p=firefly-linux-kernel-4.4.55.git

watchdog: ep93xx_wdt: Fix timeout after conversion to watchdog core

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>
---

diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c
index 414ce8fdecc9..29575f8228bd 100644
--- a/drivers/watchdog/ep93xx_wdt.c
+++ b/drivers/watchdog/ep93xx_wdt.c
@@ -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);