watchdog: imx2_wdt: Disable previously acquired clock on error path

If watchdog_register_device() fails we should disable the previously
acquired wdev->clk clock on error path.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index add1fa0fad17459158364eeb7eb2bba9bbc940b0..0bb1a1d1b170a098bfcca3a3f5b828450849f9e0 100644 (file)
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -291,7 +291,7 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
        ret = watchdog_register_device(wdog);
        if (ret) {
                dev_err(&pdev->dev, "cannot register watchdog device\n");
-               return ret;
+               goto disable_clk;
        }
 
        wdev->restart_handler.notifier_call = imx2_restart_handler;
@@ -304,6 +304,10 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
                 wdog->timeout, nowayout);
 
        return 0;
+
+disable_clk:
+       clk_disable_unprepare(wdev->clk);
+       return ret;
 }
 
 static int __exit imx2_wdt_remove(struct platform_device *pdev)