Eliminate a goto to simplify the code.
Signed-off-by: Aaro Koskinen <aaro.koski...@iki.fi>
Cc: Wim Van Sebroeck <w...@iguana.be>
---
drivers/watchdog/omap_wdt.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index af1e72e..bee43a9 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -267,8 +267,10 @@ static int __devinit omap_wdt_probe(struct platform_device
*pdev)
__omap_wdt_disable(wdev);
ret = watchdog_register_device(omap_wdt);
- if (ret)
- goto err_misc;
+ 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,
@@ -277,11 +279,6 @@ static int __devinit omap_wdt_probe(struct platform_device
*pdev)
pm_runtime_put_sync(wdev->dev);
return 0;
-
-err_misc:
- pm_runtime_disable(wdev->dev);
-
- return ret;
}
static void omap_wdt_shutdown(struct platform_device *pdev)
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
