]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
watchdog: ts72xx_wdt: disable watchdog at probe
authorMika Westerberg <mika.westerberg@iki.fi>
Sun, 29 Aug 2010 10:53:14 +0000 (13:53 +0300)
committerWim Van Sebroeck <wim@iguana.be>
Wed, 15 Sep 2010 18:43:52 +0000 (18:43 +0000)
Since it may be already enabled by bootloader or some other utility. This patch
makes sure that the watchdog is disabled before any userspace daemon opens the
device. It is also required by the watchdog API.

Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/ts72xx_wdt.c

index 458c499c1223c6f73aaab93f9a6bdc7c816de5a2..18cdeb4c4258a67ccdba77fc517596eaa71819b9 100644 (file)
@@ -449,6 +449,9 @@ static __devinit int ts72xx_wdt_probe(struct platform_device *pdev)
        wdt->pdev = pdev;
        mutex_init(&wdt->lock);
 
+       /* make sure that the watchdog is disabled */
+       ts72xx_wdt_stop(wdt);
+
        error = misc_register(&ts72xx_wdt_miscdev);
        if (error) {
                dev_err(&pdev->dev, "failed to register miscdev\n");