1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index 62946c2cb4f8..693ac3f4de5a 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -261,7 +261,7 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
         if (IS_ERR(imx2_wdt.base))
                 return PTR_ERR(imx2_wdt.base);
 
-        imx2_wdt.clk = clk_get(&pdev->dev, NULL);
+        imx2_wdt.clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(imx2_wdt.clk)) {
                 dev_err(&pdev->dev, "can't get Watchdog clock\n");
                 return PTR_ERR(imx2_wdt.clk);
@@ -286,7 +286,6 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
 
 fail:
         imx2_wdt_miscdev.parent = NULL;
-        clk_put(imx2_wdt.clk);
         return ret;
 }
 
@@ -299,8 +298,7 @@ static int __exit imx2_wdt_remove(struct platform_device *pdev)
 
                 dev_crit(imx2_wdt_miscdev.parent,
                         "Device removed: Expect reboot!\n");
-        } else
-                clk_put(imx2_wdt.clk);
+        }
 
         imx2_wdt_miscdev.parent = NULL;
         return 0;