From patchwork Sat Mar 15 09:33:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 3836641 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0486A9F1CD for ; Sat, 15 Mar 2014 09:34:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 22ADC2018E for ; Sat, 15 Mar 2014 09:34:25 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D383A2017A for ; Sat, 15 Mar 2014 09:34:23 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WOkyt-0000c0-3K; Sat, 15 Mar 2014 09:34:15 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WOkyq-0002KE-K7; Sat, 15 Mar 2014 09:34:12 +0000 Received: from moutng.kundenserver.de ([212.227.17.13]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WOkyn-0002Jq-Qg for linux-arm-kernel@lists.infradead.org; Sat, 15 Mar 2014 09:34:10 +0000 Received: from klappe2.localnet (HSI-KBW-134-3-135-108.hsi14.kabel-badenwuerttemberg.de [134.3.135.108]) by mrelayeu.kundenserver.de (node=mreue103) with ESMTP (Nemesis) id 0LnDWH-1X3q140Gcf-00hQfA; Sat, 15 Mar 2014 10:33:43 +0100 From: Arnd Bergmann To: Bjorn Andersson Subject: [PATCH] pinctrl: msm: fix build bug Date: Sat, 15 Mar 2014 10:33:36 +0100 User-Agent: KMail/1.12.2 (Linux/3.8.0-22-generic; KDE/4.3.2; x86_64; ; ) MIME-Version: 1.0 Message-Id: <201403151033.36878.arnd@arndb.de> X-Provags-ID: V02:K0:6qTMbRmz5ygActwGI1JKIACM/cSfCg8dWpdUJmyGvAi qjf4GQaxtcR8YKOPsG9PXyft3IO4B/E+R9g5EOKDISp3z4i/zW luVZQ7loVHZFlru3HjoGpzf7AfeaNlPs/8b65f+x8ZmhHXEiDE 7iNgHUiuxaprUPiF9Q9ApVi85zPv2W0ad/58SVfKIL8YtIxelq Jm/lITe7Bd/7B7rcx3zFPQQvPejnnBIGAEf4IHbLSj2hEvA37l jnjte0yIHBWIAYJfoLdnH0OYfl+LSMWgfWnzavhO1b7shnSQ7U AEZwzW/wD8Ah4JwCNqqtsllEMkDYHDkPj3ckXPNtK1zFlDxRlh VpqLh5tJ3GTquw4GyfrugdVP+xzSDLsnhxWWcxoiV X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140315_053410_119517_A3ADAF92 X-CRM114-Status: UNSURE ( 7.21 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: Linus Walleij , Stephen Boyd , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Commit 051a58b4622 "pinctrl: msm: Simplify msm_config_reg() and callers" rearranged code in the msm_config_reg function, but apparantly missed one line that was added in ed118a5fd9 "pinctrl-msm: Support output-{high,low} configuration". This (untested) patch does the same respective change to resolve the conflict. Signed-off-by: Arnd Bergmann Cc: Bjorn Andersson Cc: Linus Walleij Cc: Stephen Boyd diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c index 19d2feb..343f421 100644 --- a/drivers/pinctrl/pinctrl-msm.c +++ b/drivers/pinctrl/pinctrl-msm.c @@ -215,7 +215,6 @@ static int msm_config_reg(struct msm_pinctrl *pctrl, *mask = 7; break; case PIN_CONFIG_OUTPUT: - *reg = g->ctl_reg; *bit = g->oe_bit; *mask = 1; break;