From patchwork Thu Nov 10 16:44:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 693333 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tF88N055xz9vDh for ; Fri, 11 Nov 2016 03:46:43 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c4sUr-0003Us-Tt; Thu, 10 Nov 2016 16:46:41 +0000 Received: from mout.kundenserver.de ([212.227.126.130]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c4sUh-0003GB-Pt for linux-snps-arc@lists.infradead.org; Thu, 10 Nov 2016 16:46:33 +0000 Received: from wuerfel.lan ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lst7y-1cpX6p48C2-012U3x; Thu, 10 Nov 2016 17:45:46 +0100 From: Arnd Bergmann To: Linus Torvalds Subject: [PATCH v2 10/11] pcmcia: fix return value of soc_pcmcia_regulator_set Date: Thu, 10 Nov 2016 17:44:53 +0100 Message-Id: <20161110164454.293477-11-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20161110164454.293477-1-arnd@arndb.de> References: <20161110164454.293477-1-arnd@arndb.de> X-Provags-ID: V03:K0:t95QodDqhnfoa2pCBD/pm7c0QOd9qacrB1eGB5hVoRZl1Ir4NeE Aq54UHjtB+Vh4N9Pxx7gJPQvXPGs5bVzciMnPkO2JgeMMcTII+n/ucigD3jURJBGW8iIbB/ AjAH1tveDxAwOtTmwdDemh5aJ8kXrpvtigp6O6pUS2Nh7kzRlivD4TEIFgZ/8JZ9bUzDSCR WeGR/fCUnQfJQOSJR+ZoA== X-UI-Out-Filterresults: notjunk:1; V01:K0:Gv6vu2smxh8=:Wj+z5+FGCKOy4KfjzYzUcC S5ljuBh3SicWU4jP5+uspQR8KH7YY+chpC6ZWI2umywYjnPjuQBIx4juFPYUGExYnWy6eaGd+ FrZjEUnFUXf9ycZWUNLu616gbWZrda+dOvxggdZivMzTtaBk3r37rWlDkAxMqV8JJoedsAMZN DY4+1L75PuF4keBiVI10kVejgMRuGc1t65WBuLIis0jjoQSijYiNNb+O35jIYu/isHOR6wB8L SfPUNhYQ+iJ7+7wsdRx9a3HrvekV1lReJu8eyvCN3DCjhfewoHv9u6Uh67GRCZK/n/Dg5ugD0 GqcxjVPcnJdAbq6k9Oe1aZGJFK+AbqdKzuC0AQMY//qNeb5if+UPqSMRBW1TtzO8Gei6A6o1F 0VPxtS28LhJO+lt2WizDCuicXH3S5PRdpDelfmLjTv+K96ZazOsLgFSNLfaP85VdBbXdDoSDz 78JMsUyWAPuX4kQVXSpI+JI4cpP1cqziB/oSbwjloWB2RlMVQD9AdApCHGg/KRYI39xTzEWI+ fJ8uvXifzray9l25MzVwyeHLa+AxBAmoyuDWHAXj/JI83unCt06UJfu8jqPd+Q2mRdobD4EWF FiU6ZZcYARj79AFqS7DnindhYuUWSaJYuNZIy+7I4z37AGmUCK1+jaXkHjxOpwPFJehGdo4V4 Ts9sMrOaNnXlwXn69zczsMYewB6/uhhoMnGQ0Ts52kxVKpPcoOUmxUBfmtrJKUvI+IG4= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161110_084632_316274_70650373 X-CRM114-Status: GOOD ( 11.23 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.130 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.130 listed in wl.mailspike.net] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-snps-arc@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on Synopsys ARC Processors List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sean Young , Trond Myklebust , linux-s390@vger.kernel.org, Herbert Xu , x86@kernel.org, Sebastian Ott , Russell King , Javier Martinez Canillas , Ilya Dryomov , linux-snps-arc@lists.infradead.org, linux-media@vger.kernel.org, Arnd Bergmann , linux-kbuild@vger.kernel.org, Jiri Kosina , Michal Marek , nios2-dev@lists.rocketboards.org, Mauro Carvalho Chehab , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Anna Schumaker , "Luis R . Rodriguez" , linux-crypto@vger.kernel.org, Martin Schwidefsky , Ley Foon Tan , Andrew Morton , "David S. Miller" , Jonathan Cameron MIME-Version: 1.0 Sender: "linux-snps-arc" Errors-To: linux-snps-arc-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The newly introduced soc_pcmcia_regulator_set() function sometimes returns without setting its return code, as shown by this warning: drivers/pcmcia/soc_common.c: In function 'soc_pcmcia_regulator_set': drivers/pcmcia/soc_common.c:112:5: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized] This changes it to propagate the regulator_disable() result instead. Fixes: ac61b6001a63 ("pcmcia: soc_common: add support for Vcc and Vpp regulators") Signed-off-by: Arnd Bergmann --- drivers/pcmcia/soc_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index 153f312..b6b316d 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c @@ -107,7 +107,7 @@ int soc_pcmcia_regulator_set(struct soc_pcmcia_socket *skt, ret = regulator_enable(r->reg); } else { - regulator_disable(r->reg); + ret = regulator_disable(r->reg); } if (ret == 0) r->on = on;