From patchwork Tue Jan 21 05:20:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar X-Patchwork-Id: 3515431 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 82B10C02DC for ; Tue, 21 Jan 2014 05:21:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AA1BC2015E for ; Tue, 21 Jan 2014 05:21:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B4D552015D for ; Tue, 21 Jan 2014 05:21:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751586AbaAUFVS (ORCPT ); Tue, 21 Jan 2014 00:21:18 -0500 Received: from mail-pb0-f41.google.com ([209.85.160.41]:54376 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750923AbaAUFVL (ORCPT ); Tue, 21 Jan 2014 00:21:11 -0500 Received: by mail-pb0-f41.google.com with SMTP id up15so7357386pbc.14 for ; Mon, 20 Jan 2014 21:21:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=ccbKpMPspom8bv+HyJ0iW/UBU5weU022gDtt322Z4kU=; b=s8Z90AP9JdKkM2eZyNkzpqptsWhzLBZ3LQySFuIt6FvGQiUc/uIUPPau7uY41Q0rxg YxY8z1y1QuDNXXL77zDlnNM7+2fDkB5LzFoRB6ZiEqa87OpOjqnIKFEd114IgUap/RL7 njhSYn4TttBDMsdtDEn/0Oa0Szug7WMrkPON7GLGHE0d+IYfDZ0KU/JHT4OFC8uTGHV8 zH/d42HmQmbT6QsvZKF7x3fV1o/IdRuVbjV97SkLUuo61nykAEBYCUc3LZ6HwecLm+AW WZeOo0U0MP6TJZxLQ9r6j6+QBxJQ6tAxZkv1Jk7ysFCl1hm7KCuVpfBIKPx1I4h+LhgY kgCw== X-Received: by 10.66.155.7 with SMTP id vs7mr22601529pab.42.1390281670785; Mon, 20 Jan 2014 21:21:10 -0800 (PST) Received: from tango-charlie.vayavyatech.com ([202.62.83.107]) by mx.google.com with ESMTPSA id vf7sm8448569pbc.5.2014.01.20.21.21.07 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 20 Jan 2014 21:21:10 -0800 (PST) From: Prabhakar Lad To: Laurent Pinchart Cc: LMML , LKML , "Lad, Prabhakar" Subject: [PATCH v2] media: i2c: mt9p031: Check return value of clk_prepare_enable/clk_set_rate Date: Tue, 21 Jan 2014 10:50:57 +0530 Message-Id: <1390281657-7185-1-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Lad, Prabhakar" clk_set_rate(), clk_prepare_enable() functions can fail, so check the return values to avoid surprises. Signed-off-by: Lad, Prabhakar Acked-by: Laurent Pinchart --- Changes for v2: 1: Called regulator_bulk_disable() in the error path drivers/media/i2c/mt9p031.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c index e5ddf47..05278f5 100644 --- a/drivers/media/i2c/mt9p031.c +++ b/drivers/media/i2c/mt9p031.c @@ -222,12 +222,15 @@ static int mt9p031_clk_setup(struct mt9p031 *mt9p031) struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); struct mt9p031_platform_data *pdata = mt9p031->pdata; + int ret; mt9p031->clk = devm_clk_get(&client->dev, NULL); if (IS_ERR(mt9p031->clk)) return PTR_ERR(mt9p031->clk); - clk_set_rate(mt9p031->clk, pdata->ext_freq); + ret = clk_set_rate(mt9p031->clk, pdata->ext_freq); + if (ret < 0) + return ret; mt9p031->pll.ext_clock = pdata->ext_freq; mt9p031->pll.pix_clock = pdata->target_freq; @@ -286,8 +289,14 @@ static int mt9p031_power_on(struct mt9p031 *mt9p031) return ret; /* Emable clock */ - if (mt9p031->clk) - clk_prepare_enable(mt9p031->clk); + if (mt9p031->clk) { + ret = clk_prepare_enable(mt9p031->clk); + if (ret) { + regulator_bulk_disable(ARRAY_SIZE(mt9p031->regulators), + mt9p031->regulators); + return ret; + } + } /* Now RESET_BAR must be high */ if (gpio_is_valid(mt9p031->reset)) {