On Fri, May 25, 2012 at 08:14:49PM -0300, Fabio Estevam wrote: > From: Fabio Estevam <fabio.este...@freescale.com> > > Prepare the clock before enabling it. > > Cc: Guennadi Liakhovetski <g.liakhovet...@gmx.de> > Cc: <linux-media@vger.kernel.org> > Signed-off-by: Fabio Estevam <fabio.este...@freescale.com>
Acked-by: Sascha Hauer <s.ha...@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 > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
