summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/twl4030_wdt.c
diff options
context:
space:
mode:
authorAmeya Palande <ameya.palande@nokia.com>2010-05-17 14:12:15 +0300
committerWim Van Sebroeck <wim@iguana.be>2010-05-25 09:05:46 +0000
commitbb6f36070cf53ebf08383a026e1d3a437cb310d1 (patch)
tree8ebb29832f65be86687a5d6aa7e8bcc725822760 /drivers/watchdog/twl4030_wdt.c
parent4724ba575ea73431aba8a48be6f5a382c470418d (diff)
downloadlinux-bb6f36070cf53ebf08383a026e1d3a437cb310d1.tar.gz
linux-bb6f36070cf53ebf08383a026e1d3a437cb310d1.tar.bz2
linux-bb6f36070cf53ebf08383a026e1d3a437cb310d1.zip
watchdog: twl4030_wdt: Disable watchdog during probing
If we are not able to register then it is better to have watchdog in disabled state than noticing a system reboot. Signed-off-by: Ameya Palande <ameya.palande@nokia.com> Acked-By: Timo Kokkonen <timo.t.kokkonen@nokia.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/twl4030_wdt.c')
-rw-r--r--drivers/watchdog/twl4030_wdt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
index dcabe77ad141..b5045ca7e61c 100644
--- 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,