Browse Source

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>
Uwe Kleine-König 9 năm trước cách đây
mục cha
commit
8605fec1ce
1 tập tin đã thay đổi với 2 bổ sung1 xóa
  1. 2 1
      drivers/watchdog/omap_wdt.c

+ 2 - 1
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) {