Hi Uwe, > 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 <[email protected]> > --- > drivers/watchdog/omap_wdt.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c > index af8947429c91..ae673cd06aa1 100644 > --- a/drivers/watchdog/omap_wdt.c > +++ b/drivers/watchdog/omap_wdt.c > @@ -270,7 +270,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) { > -- > 2.6.2 >
Patch added to linux-watchdog-next. Kind regards, Wim. -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
