From patchwork Sat Jul 20 19:10:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 19345 X-Patchwork-Delegate: kamil@wypas.org Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1V0cYl-0007L4-Nc; Sat, 20 Jul 2013 21:11:15 +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 1V0cYj-00053q-kc; Sat, 20 Jul 2013 21:11:15 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754778Ab3GTTKy (ORCPT + 1 other); Sat, 20 Jul 2013 15:10:54 -0400 Received: from mail-ye0-f170.google.com ([209.85.213.170]:60496 "EHLO mail-ye0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754484Ab3GTTKw (ORCPT ); Sat, 20 Jul 2013 15:10:52 -0400 Received: by mail-ye0-f170.google.com with SMTP id q3so1661106yen.29 for ; Sat, 20 Jul 2013 12:10:51 -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; bh=pZW3s9u8iThNs1sjwQ2QJ/H+BYkHtAxIhKKbBhs51Z8=; b=AIgafMGDgOUcJOl06I53zp2ZAa4BZhOyB79RSqTQYRG7yKiFXZPxQs8eCInaCFH4vG lBmJYe+rie/p0q+zRer9AIjGnZsLgMYCeq4SgWtKabrnQKRqAfN+NV1U5fAJ6/upQE8v 6OjpNJgvxZ5VOleuhbnUgHvPtX2eTdUxKFeaC59DZY1CL6k9dGihR2X2+Uy28COR4Q64 KC1chMTXd4qr7THlyfIdtVSoUd07DNdsgDogSsE45E9go9syZotl3g6cahRrs99v0l2c CeqlUo+Kv3hyb3ryreB34nv1BSTzuw/KOlYUC10HALw4JPWulM63JzYfoPkMavIVp8R6 4Ytw== X-Received: by 10.236.153.233 with SMTP id f69mr11272884yhk.76.1374347451695; Sat, 20 Jul 2013 12:10:51 -0700 (PDT) Received: from localhost.localdomain ([189.5.19.145]) by mx.google.com with ESMTPSA id u25sm28524839yhl.23.2013.07.20.12.10.49 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 20 Jul 2013 12:10:51 -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 v2 1/2] [media] coda: Check the return value from clk_prepare_enable() Date: Sat, 20 Jul 2013 16:10:40 -0300 Message-Id: <1374347441-15662-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.8.1.2 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.20.185737 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_1300_1399 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, __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 v1: - Add missing 'if' drivers/media/platform/coda.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c index df4ada88..486db30 100644 --- a/drivers/media/platform/coda.c +++ b/drivers/media/platform/coda.c @@ -1559,14 +1559,21 @@ 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; + + 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: v4l2_fh_del(&ctx->fh); v4l2_fh_exit(&ctx->fh);