From patchwork Fri May 25 23:14:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 11507 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SY3jP-0004Vi-KV for patchwork@linuxtv.org; Sat, 26 May 2012 01:15:39 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp for id 1SY3jO-00056U-CT; Sat, 26 May 2012 01:15:39 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932634Ab2EYXP3 (ORCPT ); Fri, 25 May 2012 19:15:29 -0400 Received: from mail-vb0-f46.google.com ([209.85.212.46]:44508 "EHLO mail-vb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932546Ab2EYXP1 (ORCPT ); Fri, 25 May 2012 19:15:27 -0400 Received: by mail-vb0-f46.google.com with SMTP id ff1so1025024vbb.19 for ; Fri, 25 May 2012 16:15:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=69I4mxrquK/QuEd3wJzrANNTAv56Q57Ja0/IartSvWk=; b=BLKB6mr07Z4GGcoYdibH4/ZPOANJ7ZLiWUOgxKIfihHcJLVt02pL9d3C+AbZ3tl4i9 ttsmrlX35KsSJnFzSNr8vmgLESc2hRoXm+tD3YyIJLFLAL7C6jA+7stVQ9eeTAg0q/Bb /SIS5zoHigS1CUOKViMxNifkhaeq4cQscBYtTomXb8dTCvdBU7DT1jmOkgWmOewNaIvF COA/N4ISt4eHx6hZfsBViVFCY5YoNkXM2fnH/9mKjyrKFS1QnjddPlQkehIX5OHv1uy+ IkHfKl3X61Bv4q/8mpProtMGhyQn4oxs2arF+EOYOM2VEs/HgMJcZfbgvcNLMOt9hrkP dL+A== Received: by 10.220.154.67 with SMTP id n3mr742656vcw.14.1337987726793; Fri, 25 May 2012 16:15:26 -0700 (PDT) Received: from localhost.localdomain ([201.82.161.72]) by mx.google.com with ESMTPS id s10sm2787583vdg.10.2012.05.25.16.15.24 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 25 May 2012 16:15:26 -0700 (PDT) From: Fabio Estevam To: kernel@pengutronix.de Cc: shawn.guo@freescale.com, Fabio Estevam , Guennadi Liakhovetski , Subject: [PATCH 08/15] video: mx2_emmaprp: Use clk_prepare_enable/clk_disable_unprepare Date: Fri, 25 May 2012 20:14:49 -0300 Message-Id: <1337987696-31728-8-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1337987696-31728-1-git-send-email-festevam@gmail.com> References: <1337987696-31728-1-git-send-email-festevam@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.5.25.230631 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1200_1299 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' From: Fabio Estevam Prepare the clock before enabling it. Cc: Guennadi Liakhovetski Cc: Signed-off-by: Fabio Estevam Acked-by: Sascha Hauer --- 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);