From 68872e3216310685f8cdcd5bd1626e41a155dc20 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Wed, 10 Oct 2012 23:23:37 +0300 Subject: [PATCH] --- yaml --- r: 347993 b: refs/heads/master c: 1ba85387f0224dca9f0f9d783b09c9ceeb1c91bd h: refs/heads/master i: 347991: 2040ecafebbd40f4faa325562a22799db82f6ffc v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/omap_wdt.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 753763a46cb9..422822a43687 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef4817472982b3b6d993e6456cfad58dc848ef70 +refs/heads/master: 1ba85387f0224dca9f0f9d783b09c9ceeb1c91bd diff --git a/trunk/drivers/watchdog/omap_wdt.c b/trunk/drivers/watchdog/omap_wdt.c index 1474c2bd3077..34ed61ea02b4 100644 --- a/trunk/drivers/watchdog/omap_wdt.c +++ b/trunk/drivers/watchdog/omap_wdt.c @@ -265,8 +265,10 @@ static int omap_wdt_probe(struct platform_device *pdev) omap_wdt_disable(wdev); ret = watchdog_register_device(omap_wdt); - if (ret) - goto err_register; + if (ret) { + pm_runtime_disable(wdev->dev); + return ret; + } pr_info("OMAP Watchdog Timer Rev 0x%02x: initial timeout %d sec\n", __raw_readl(wdev->base + OMAP_WATCHDOG_REV) & 0xFF, @@ -275,11 +277,6 @@ static int omap_wdt_probe(struct platform_device *pdev) pm_runtime_put_sync(wdev->dev); return 0; - -err_register: - pm_runtime_disable(wdev->dev); - - return ret; } static void omap_wdt_shutdown(struct platform_device *pdev)