diff --git a/[refs] b/[refs] index 8ab89c258230..f2a7540db7d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4724ba575ea73431aba8a48be6f5a382c470418d +refs/heads/master: bb6f36070cf53ebf08383a026e1d3a437cb310d1 diff --git a/trunk/drivers/watchdog/twl4030_wdt.c b/trunk/drivers/watchdog/twl4030_wdt.c index dcabe77ad141..b5045ca7e61c 100644 --- a/trunk/drivers/watchdog/twl4030_wdt.c +++ b/trunk/drivers/watchdog/twl4030_wdt.c @@ -190,6 +190,8 @@ static int __devinit twl4030_wdt_probe(struct platform_device *pdev) twl4030_wdt_dev = pdev; + twl4030_wdt_disable(wdt); + ret = misc_register(&wdt->miscdev); if (ret) { dev_err(wdt->miscdev.parent,