From patchwork Tue Jul 23 01:38:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 19358 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1V1ReH-0004Uy-Hz; Tue, 23 Jul 2013 03:44:21 +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.72/mailfrontend-8) with esmtp id 1V1ReF-0002wE-l2; Tue, 23 Jul 2013 03:44:21 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752411Ab3GWBoR (ORCPT + 1 other); Mon, 22 Jul 2013 21:44:17 -0400 Received: from mail-yh0-f47.google.com ([209.85.213.47]:43534 "EHLO mail-yh0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751226Ab3GWBoR (ORCPT ); Mon, 22 Jul 2013 21:44:17 -0400 Received: by mail-yh0-f47.google.com with SMTP id z20so936258yhz.6 for ; Mon, 22 Jul 2013 18:44:16 -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=um6HC2HbUy9Kvxkb0KlX0cociM4+OLPhT7XvRjFR5a0=; b=t4U4S0Nbw6OdUqlVVoPYTnOtriYe1vKjiZQ5cWka6YmnfK4HvQr4Xe7+uCaUjoqQo7 YEtXQcF5Jhug02JSPJDEDA7kU4uBcxpfDPp4Ldair1XV0Z9Cr1Zr2m9rV5h+aI0xje56 F9dD8Kjbz/IJIaixAHii4S9nXpetsHQSqcVkWqPwKqTs3ztWPHnifD0t/wbRaS67eMxV GX6UKXjoGLPTbzVKG0TZU6vrtq7IBGf2jnskXame3HpBCilf+Q5AO0cXXeP1yotUgNU2 oxwa2BdgHJOqkkbiz+WN0hk44JogxUcpLfR8tzKQheCbojsKijiSZNUuhZFhfgBluF5Y mFcA== X-Received: by 10.236.111.162 with SMTP id w22mr14283125yhg.213.1374543515856; Mon, 22 Jul 2013 18:38:35 -0700 (PDT) Received: from localhost.localdomain ([177.194.44.29]) by mx.google.com with ESMTPSA id z45sm42751976yhb.0.2013.07.22.18.38.33 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Jul 2013 18:38:35 -0700 (PDT) From: Fabio Estevam To: k.debski@samsung.com Cc: m.chehab@samsung.com, kernel@pengutronix.de, linux-media@vger.kernel.org, Fabio Estevam Subject: [PATCH v3 2/3] [media] coda: Check the return value from clk_prepare_enable() Date: Mon, 22 Jul 2013 22:38:21 -0300 Message-Id: <1374543502-22678-2-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1374543502-22678-1-git-send-email-festevam@gmail.com> References: <1374543502-22678-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: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.7.23.13632 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_1500_1599 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 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 , __YOUTUBE_RCVD 0' From: Fabio Estevam clk_prepare_enable() may fail, so let's check its return value and propagate it in the case of error. Signed-off-by: Fabio Estevam --- - Changes since v2: - Release the previously acquired resources Changes since v1: - Add missing 'if' drivers/media/platform/coda.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c index ea16c20..5f15aaa 100644 --- a/drivers/media/platform/coda.c +++ b/drivers/media/platform/coda.c @@ -1561,14 +1561,27 @@ static int coda_open(struct file *file) list_add(&ctx->list, &dev->instances); coda_unlock(ctx); - clk_prepare_enable(dev->clk_per); - clk_prepare_enable(dev->clk_ahb); + ret = clk_prepare_enable(dev->clk_per); + if (ret) + goto err_clk_per; + + ret = clk_prepare_enable(dev->clk_ahb); + if (ret) + goto err_clk_ahb; v4l2_dbg(1, coda_debug, &dev->v4l2_dev, "Created instance %d (%p)\n", ctx->idx, ctx); return 0; +err_clk_ahb: + clk_disable_unprepare(dev->clk_per); +err_clk_per: + coda_lock(ctx); + list_del(&ctx->list); + coda_unlock(ctx); + dma_free_coherent(&dev->plat_dev->dev, CODA_PARA_BUF_SIZE, + ctx->parabuf.vaddr, ctx->parabuf.paddr); err_dma_alloc: v4l2_ctrl_handler_free(&ctx->ctrls); err_ctrls_setup: