diff options
| author | Mika Westerberg <mika.westerberg@iki.fi> | 2012-03-18 13:09:52 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2012-03-27 20:15:17 +0200 |
| commit | 59dcf1eb1a4b15610c68a4dbb7430d61a65f4af3 (patch) | |
| tree | b15315a65f857cfcfe01543c68e834e65707d322 /drivers/watchdog/ep93xx_wdt.c | |
| parent | e12a679ddee4eb5ab2f99f7cf129355461e142c0 (diff) | |
| download | lwn-59dcf1eb1a4b15610c68a4dbb7430d61a65f4af3.tar.gz lwn-59dcf1eb1a4b15610c68a4dbb7430d61a65f4af3.zip | |
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>
Diffstat (limited to 'drivers/watchdog/ep93xx_wdt.c')
| -rw-r--r-- | drivers/watchdog/ep93xx_wdt.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); |