Replace clk_enable/clk_disable with clk_prepare_enable/clk_disable_unprepare as required by the common clock framework. Signed-off-by: Sachin Kamat <sachin.kamat@xxxxxxxxxx> Cc: Kamil Debski <k.debski@xxxxxxxxxxx> --- drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c index 367db75..f7c5c5a 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c @@ -100,7 +100,7 @@ int s5p_mfc_clock_on(void) atomic_inc(&clk_ref); mfc_debug(3, "+ %d", atomic_read(&clk_ref)); #endif - ret = clk_enable(pm->clock_gate); + ret = clk_prepare_enable(pm->clock_gate); return ret; } @@ -110,7 +110,7 @@ void s5p_mfc_clock_off(void) atomic_dec(&clk_ref); mfc_debug(3, "- %d", atomic_read(&clk_ref)); #endif - clk_disable(pm->clock_gate); + clk_disable_unprepare(pm->clock_gate); } int s5p_mfc_power_on(void) -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
