Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / watchdog / twl4030_wdt.c

diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
index dcabe77..b5045ca 100644 (file)
--- a/drivers/watchdog/twl4030_wdt.c
+++ b/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,