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-g2d/g2d.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c index 1bfbc32..adecd25 100644 --- a/drivers/media/platform/s5p-g2d/g2d.c +++ b/drivers/media/platform/s5p-g2d/g2d.c @@ -589,7 +589,7 @@ static void device_run(void *prv) src = v4l2_m2m_next_src_buf(ctx->m2m_ctx); dst = v4l2_m2m_next_dst_buf(ctx->m2m_ctx); - clk_enable(dev->gate); + clk_prepare_enable(dev->gate); g2d_reset(dev); spin_lock_irqsave(&dev->ctrl_lock, flags); @@ -619,7 +619,7 @@ static irqreturn_t g2d_isr(int irq, void *prv) struct vb2_buffer *src, *dst; g2d_clear_int(dev); - clk_disable(dev->gate); + clk_disable_unprepare(dev->gate); BUG_ON(ctx == NULL); -- 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