summaryrefslogtreecommitdiff
path: root/drivers/watchdog/omap_wdt.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2015-12-15 13:37:41 +0300
committerWim Van Sebroeck <wim@iguana.be>2015-12-27 23:09:40 +0300
commit8605fec1ce2a397f738f1c394be7847dacf31b0c (patch)
tree86eb69ba89e28251aaa487fd34d85668020b9dcb /drivers/watchdog/omap_wdt.c
parenta6392490fbb18f71d228d9c517516fa78fb23883 (diff)
downloadlinux-8605fec1ce2a397f738f1c394be7847dacf31b0c.tar.xz
watchdog: omap: don't disable the timer when it should be enabled early
With the early_enable module parameter the watchdog can be started during driver probe time. If this is requested the bets are good that the timer is already running, so to narrow the gap where the timer is disabled only call the disable function when the timer shouldn't be started. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/omap_wdt.c')
-rw-r--r--drivers/watchdog/omap_wdt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 39e93f631c37..1b02bfa81b29 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -271,7 +271,8 @@ static int omap_wdt_probe(struct platform_device *pdev)
wdev->wdog.bootstatus = WDIOF_CARDRESET;
}
- omap_wdt_disable(wdev);
+ if (!early_enable)
+ omap_wdt_disable(wdev);
ret = watchdog_register_device(&wdev->wdog);
if (ret) {