Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / drivers / watchdog / omap_wdt.c

diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 6f17c93..1b02bfa 100644 (file)
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -271,7 +271,8 @@ static int omap_wdt_probe(struct platform_device *pdev)
                        wdev->wdog.bootstatus = WDIOF_CARDRESET;
        }
 
-       omap_wdt_disable(wdev);
+       if (!early_enable)
+               omap_wdt_disable(wdev);
 
        ret = watchdog_register_device(&wdev->wdog);
        if (ret) {
@@ -283,11 +284,11 @@ static int omap_wdt_probe(struct platform_device *pdev)
                readl_relaxed(wdev->base + OMAP_WATCHDOG_REV) & 0xFF,
                wdev->wdog.timeout);
 
-       pm_runtime_put_sync(wdev->dev);
-
        if (early_enable)
                omap_wdt_start(&wdev->wdog);
 
+       pm_runtime_put(wdev->dev);
+
        return 0;
 }