[media] s5p-mfc: Ensure that clock is disabled before turning power off

Move clock disabling before turning power off.  This will enable later
to add calls to clk_prepare/unprepare in the s5p_mfc_power_off() function
to avoid keeping clocks prepared all the time when driver is bound.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index da735cda2882071d6f32bf3f16a69b25b2164c29..991649111e77f868b3b2926b88d35b9b60f5fd8a 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -963,11 +963,13 @@ static int s5p_mfc_release(struct file *file)
                        mfc_debug(2, "Last instance\n");
                        s5p_mfc_deinit_hw(dev);
                        del_timer_sync(&dev->watchdog_timer);
+                       s5p_mfc_clock_off();
                        if (s5p_mfc_power_off() < 0)
                                mfc_err("Power off failed\n");
+               } else {
+                       mfc_debug(2, "Shutting down clock\n");
+                       s5p_mfc_clock_off();
                }
-               mfc_debug(2, "Shutting down clock\n");
-               s5p_mfc_clock_off();
        }
        if (dev)
                dev->ctx[ctx->num] = NULL;