diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2015-12-15 11:37:40 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2015-12-27 21:09:36 +0100 |
| commit | a6392490fbb18f71d228d9c517516fa78fb23883 (patch) | |
| tree | 10ce7f605cce7a4f879ca2ea07616303045dfd11 /drivers/watchdog/omap_wdt.c | |
| parent | 3024e0d13b0f34536f94bf0d7cc11443beeee9c5 (diff) | |
| download | blackbird-op-linux-a6392490fbb18f71d228d9c517516fa78fb23883.tar.gz blackbird-op-linux-a6392490fbb18f71d228d9c517516fa78fb23883.zip | |
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 <u.kleine-koenig@pengutronix.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/omap_wdt.c')
| -rw-r--r-- | drivers/watchdog/omap_wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |
