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: 101540 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp823986qge; Thu, 10 Nov 2016 08:46:56 -0800 (PST) X-Received: by 10.99.125.77 with SMTP id m13mr25302913pgn.58.1478796416607; Thu, 10 Nov 2016 08:46:56 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 76si5784674pfo.238.2016.11.10.08.46.56; Thu, 10 Nov 2016 08:46:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935215AbcKJQqm (ORCPT + 27 others); Thu, 10 Nov 2016 11:46:42 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:54772 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935010AbcKJQqj (ORCPT ); Thu, 10 Nov 2016 11:46:39 -0500 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 Cc: Andrew Morton , Arnd Bergmann , Anna Schumaker , "David S. Miller" , Herbert Xu , Ilya Dryomov , Javier Martinez Canillas , Jiri Kosina , Jonathan Cameron , Ley Foon Tan , "Luis R . Rodriguez" , Martin Schwidefsky , Mauro Carvalho Chehab , Michal Marek , Russell King , Sean Young , Sebastian Ott , Trond Myklebust , x86@kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-snps-arc@lists.infradead.org, nios2-dev@lists.rocketboards.org, linux-s390@vger.kernel.org, linux-crypto@vger.kernel.org, linux-media@vger.kernel.org, linux-nfs@vger.kernel.org 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= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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(-) -- 2.9.0 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;