1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/media/platform/davinci/isif.c b/drivers/media/platform/davinci/isif.c
index b99d5423e3a8..2c26c3e1837e 100644
--- a/drivers/media/platform/davinci/isif.c
+++ b/drivers/media/platform/davinci/isif.c
@@ -1053,7 +1053,7 @@ static int __devinit isif_probe(struct platform_device *pdev)
                 status = PTR_ERR(isif_cfg.mclk);
                 goto fail_mclk;
         }
-        if (clk_enable(isif_cfg.mclk)) {
+        if (clk_prepare_enable(isif_cfg.mclk)) {
                 status = -ENODEV;
                 goto fail_mclk;
         }
@@ -1125,6 +1125,7 @@ fail_nobase_res:
                 i--;
         }
 fail_mclk:
+        clk_disable_unprepare(isif_cfg.mclk);
         clk_put(isif_cfg.mclk);
         vpfe_unregister_ccdc_device(&isif_hw_dev);
         return status;
@@ -1145,6 +1146,8 @@ static int isif_remove(struct platform_device *pdev)
                 i++;
         }
         vpfe_unregister_ccdc_device(&isif_hw_dev);
+        clk_disable_unprepare(isif_cfg.mclk);
+        clk_put(isif_cfg.mclk);
         return 0;
 }