From: Uwe Kleine-König Date: Tue, 15 Dec 2015 10:37:41 +0000 (+0100) Subject: watchdog: omap: don't disable the timer when it should be enabled early X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8605fec1ce2a397f738f1c394be7847dacf31b0c;p=deliverable%2Flinux.git 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 Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck --- 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) {