From c1dade9375ba3c0bc9eaece30d7ed0853206cbb5 Mon Sep 17 00:00:00 2001 From: Ameya Palande Date: Mon, 17 May 2010 14:12:15 +0300 Subject: [PATCH] --- yaml --- r: 198373 b: refs/heads/master c: bb6f36070cf53ebf08383a026e1d3a437cb310d1 h: refs/heads/master i: 198371: 330608e94a0912559bf28ede6b146a048e4cc880 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/twl4030_wdt.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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,