From: Uwe Kleine-König Date: Tue, 15 Dec 2015 10:37:40 +0000 (+0100) Subject: watchdog: omap: don't disable runtime pm before starting device X-Git-Tag: v4.5-rc1~79^2~31 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a6392490fbb18f71d228d9c517516fa78fb23883;p=linux.git watchdog: omap: don't disable runtime pm before starting device omap_wdt_start calls pm_runtime_get_sync so dropping a reference just before calling omap_wdt_start doesn't make much sense. Moreover there is no point to use the synchronous variant of pm_runtime_put because the driver doesn't care if the clock is disabled before or after omap_wdt_probe returns. Signed-off-by: Uwe Kleine-König Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck --- diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c index 6f17c935a6cf..39e93f631c37 100644 --- a/drivers/watchdog/omap_wdt.c +++ b/drivers/watchdog/omap_wdt.c @@ -283,11 +283,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; }