diff mbox

[08/15] video: mx2_emmaprp: Use clk_prepare_enable/clk_disable_unprepare

Message ID 1337987696-31728-8-git-send-email-festevam@gmail.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

Fabio Estevam May 25, 2012, 11:14 p.m. UTC 
  From: Fabio Estevam <fabio.estevam@freescale.com>

Prepare the clock before enabling it.

Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: <linux-media@vger.kernel.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/media/video/mx2_emmaprp.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Comments

Sascha Hauer May 29, 2012, 9:21 a.m. UTC | #1 
On Fri, May 25, 2012 at 08:14:49PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Prepare the clock before enabling it.
> 
> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> Cc: <linux-media@vger.kernel.org>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Acked-by: Sascha Hauer <s.hauer@pengutronix.de>

> ---
>  drivers/media/video/mx2_emmaprp.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/video/mx2_emmaprp.c b/drivers/media/video/mx2_emmaprp.c
> index 0bd5815..b364557 100644
> --- a/drivers/media/video/mx2_emmaprp.c
> +++ b/drivers/media/video/mx2_emmaprp.c
> @@ -800,7 +800,7 @@ static int emmaprp_open(struct file *file)
>  		return ret;
>  	}
>  
> -	clk_enable(pcdev->clk_emma);
> +	clk_prepare_enable(pcdev->clk_emma);
>  	ctx->q_data[V4L2_M2M_SRC].fmt = &formats[1];
>  	ctx->q_data[V4L2_M2M_DST].fmt = &formats[0];
>  
> @@ -816,7 +816,7 @@ static int emmaprp_release(struct file *file)
>  
>  	dprintk(pcdev, "Releasing instance %p\n", ctx);
>  
> -	clk_disable(pcdev->clk_emma);
> +	clk_disable_unprepare(pcdev->clk_emma);
>  	v4l2_m2m_ctx_release(ctx->m2m_ctx);
>  	kfree(ctx);
>  
> -- 
> 1.7.1
> 
>
diff mbox

Patch

diff --git a/drivers/media/video/mx2_emmaprp.c b/drivers/media/video/mx2_emmaprp.c
index 0bd5815..b364557 100644
--- a/drivers/media/video/mx2_emmaprp.c
+++ b/drivers/media/video/mx2_emmaprp.c
@@ -800,7 +800,7 @@  static int emmaprp_open(struct file *file)
 		return ret;
 	}
 
-	clk_enable(pcdev->clk_emma);
+	clk_prepare_enable(pcdev->clk_emma);
 	ctx->q_data[V4L2_M2M_SRC].fmt = &formats[1];
 	ctx->q_data[V4L2_M2M_DST].fmt = &formats[0];
 
@@ -816,7 +816,7 @@  static int emmaprp_release(struct file *file)
 
 	dprintk(pcdev, "Releasing instance %p\n", ctx);
 
-	clk_disable(pcdev->clk_emma);
+	clk_disable_unprepare(pcdev->clk_emma);
 	v4l2_m2m_ctx_release(ctx->m2m_ctx);
 	kfree(ctx);