UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Uwe Kleine-König 2015-12-15 11:37:41 +01:00 committed by Wim Van Sebroeck
parent a6392490fb
commit 8605fec1ce
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/watchdog/omap_wdt.c
View File

@ -271,7 +271,8 @@ static int omap_wdt_probe(struct platform_device *pdev)
wdev->wdog.bootstatus = WDIOF_CARDRESET; wdev->wdog.bootstatus = WDIOF_CARDRESET;
} }
omap_wdt_disable(wdev); if (!early_enable)
omap_wdt_disable(wdev);
ret = watchdog_register_device(&wdev->wdog); ret = watchdog_register_device(&wdev->wdog);
if (ret) { if (ret) {