From patchwork Mon Jul 2 07:41:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Kleine-Budde X-Patchwork-Id: 1145821 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id E9342DFFAD for ; Mon, 2 Jul 2012 07:45:57 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SlbGs-0005iL-AL; Mon, 02 Jul 2012 07:42:10 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SlbGj-0005i1-T8 for linux-arm-kernel@lists.infradead.org; Mon, 02 Jul 2012 07:42:04 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1SlbGS-0004RQ-2D; Mon, 02 Jul 2012 09:41:44 +0200 Received: from mkl by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1SlbGR-0006I9-8C; Mon, 02 Jul 2012 09:41:43 +0200 From: Marc Kleine-Budde To: mturquette@linaro.org Subject: [PATCH v2] clk: __clk_set_parent: set uninitialized variable Date: Mon, 2 Jul 2012 09:41:42 +0200 Message-Id: <1341214902-15667-1-git-send-email-mkl@pengutronix.de> X-Mailer: git-send-email 1.7.10 X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Rajendra Nayak , Marc Kleine-Budde , kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This patch fixes the following warning: drivers/clk/clk.c: In function '__clk_set_parent': drivers/clk/clk.c:1083:5: warning: 'i' may be used uninitialized in this function [-Wuninitialized] which has been introduced with commit: commit 7975059db572eb47f0fb272a62afeae272a4b209 Author: Rajendra Nayak Date: Wed Jun 6 14:41:31 2012 +0530 clk: Allow late cache allocation for clk->parents This patch applies to linux-3.5-rc5 Cc: Rajendra Nayak Signed-off-by: Marc Kleine-Budde --- Hello, here an updated version. Changes since v1: - Set i to clk->num_parents as Uwe pointed out. regards, Marc drivers/clk/clk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index dcbe056..9a75635 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1068,13 +1068,15 @@ static int __clk_set_parent(struct clk *clk, struct clk *parent) old_parent = clk->parent; /* find index of new parent clock using cached parent ptrs */ - if (clk->parents) + if (clk->parents) { for (i = 0; i < clk->num_parents; i++) if (clk->parents[i] == parent) break; - else + } else { + i = clk->num_parents clk->parents = kzalloc((sizeof(struct clk*) * clk->num_parents), GFP_KERNEL); + } /* * find index of new parent clock using string name comparison