2 files changed, 8 insertions, 19 deletions

diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c
index 520e4398b69c..0741945b79ed 100644
--- a/drivers/media/platform/exynos4-is/fimc-is.c
+++ b/drivers/media/platform/exynos4-is/fimc-is.c
@@ -834,23 +834,11 @@ static int fimc_is_probe(struct platform_device *pdev)
                 goto err_clk;
         }
         pm_runtime_enable(dev);
-        /*
-         * Enable only the ISP power domain, keep FIMC-IS clocks off until
-         * the whole clock tree is configured. The ISP power domain needs
-         * be active in order to acces any CMU_ISP clock registers.
-         */
-        ret = pm_runtime_get_sync(dev);
-        if (ret < 0)
-                goto err_irq;
-
-        ret = fimc_is_setup_clocks(is);
-        pm_runtime_put_sync(dev);
 
+        ret = pm_runtime_get_sync(dev);
         if (ret < 0)
                 goto err_irq;
 
-        is->clk_init = true;
-
         is->alloc_ctx = vb2_dma_contig_init_ctx(dev);
         if (IS_ERR(is->alloc_ctx)) {
                 ret = PTR_ERR(is->alloc_ctx);
@@ -872,6 +860,8 @@ static int fimc_is_probe(struct platform_device *pdev)
         if (ret < 0)
                 goto err_dfs;
 
+        pm_runtime_put_sync(dev);
+
         dev_dbg(dev, "FIMC-IS registered successfully\n");
         return 0;
 
@@ -891,9 +881,11 @@ err_clk:
 static int fimc_is_runtime_resume(struct device *dev)
 {
         struct fimc_is *is = dev_get_drvdata(dev);
+        int ret;
 
-        if (!is->clk_init)
-                return 0;
+        ret = fimc_is_setup_clocks(is);
+        if (ret)
+                return ret;
 
         return fimc_is_enable_clocks(is);
 }
@@ -902,9 +894,7 @@ static int fimc_is_runtime_suspend(struct device *dev)
 {
         struct fimc_is *is = dev_get_drvdata(dev);
 
-        if (is->clk_init)
-                fimc_is_disable_clocks(is);
-
+        fimc_is_disable_clocks(is);
         return 0;
 }
 
diff --git a/drivers/media/platform/exynos4-is/fimc-is.h b/drivers/media/platform/exynos4-is/fimc-is.h
index 606a7c9fe526..d7db133b493f 100644
--- a/drivers/media/platform/exynos4-is/fimc-is.h
+++ b/drivers/media/platform/exynos4-is/fimc-is.h
@@ -264,7 +264,6 @@ struct fimc_is {
         spinlock_t                      slock;
 
         struct clk                      *clocks[ISS_CLKS_MAX];
-        bool                            clk_init;
         void __iomem                    *regs;
         void __iomem                    *pmu_regs;
         int                             irq;