| Message ID | 1401436631-30576-1-git-send-email-linus.walleij@linaro.org |
|---|---|
| State | Accepted |
| Commit | 29c7f1f53bfb3770bdb65a9e79064a963dd40621 |
| Headers | show
Return-Path: <patchwork-forward+bncBDE6RCFOWIARBX7TUCOAKGQEAHVJXNY@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f200.google.com (mail-ve0-f200.google.com [209.85.128.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4D86B20671 for <linaro@patches.linaro.org>; Fri, 30 May 2014 07:57:19 +0000 (UTC) Received: by mail-ve0-f200.google.com with SMTP id pa12sf7061004veb.3 for <linaro@patches.linaro.org>; Fri, 30 May 2014 00:57:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=NUt70itoK1+EwGJG2l/czykiU5SuKBNRpuZ6/DxmLqo=; b=bgzStRamFaZg/Rhbhb9ARyrj9GXU0Y7o7LjM88n+xfFrEGkZe620n2YzoI11LzEY9t tyolLfSbvQfzfCloznDeZL4bG3Ve4azF01EJqkHfKTR/kZh5VRJGCVrY2Ut5sLrtFMK7 I4B81Gr8iXkHel1hnQflKuElEHrJdUjh+SfsFIw1RlX+YmkbZlah8LAqJKRLCiGl3Nll h7mvezFX+CoMAsEp0RyGe1ob5yO6RlU5/S/+igY6L2U6Gk9jAq5/hbnzHtyqeqzvpegK +RH9o9e6ihk8W72TVIB4b2un17KONSjnmarUkxcEyV9AgC/WifggHVZFDvmyKASNc41L bfxQ== X-Gm-Message-State: ALoCoQms5odwXKkMgvo9NzBHtqzSX4TqIUoLzd3B4QnYW28fZRxzcl1xw0lD/+wmUmcO4kWg2SQ0 X-Received: by 10.236.162.9 with SMTP id x9mr3932250yhk.17.1401436639086; Fri, 30 May 2014 00:57:19 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.17.19 with SMTP id 19ls900167qgc.69.gmail; Fri, 30 May 2014 00:57:19 -0700 (PDT) X-Received: by 10.52.64.225 with SMTP id r1mr10181089vds.30.1401436638989; Fri, 30 May 2014 00:57:18 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id ht8si2462739vdb.61.2014.05.30.00.57.18 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 30 May 2014 00:57:18 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id hy4so1644796vcb.25 for <patchwork-forward@linaro.org>; Fri, 30 May 2014 00:57:18 -0700 (PDT) X-Received: by 10.58.243.72 with SMTP id ww8mr359677vec.49.1401436638890; Fri, 30 May 2014 00:57:18 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp91637vcb; Fri, 30 May 2014 00:57:18 -0700 (PDT) X-Received: by 10.66.144.129 with SMTP id sm1mr16126794pab.40.1401436638102; Fri, 30 May 2014 00:57:18 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id aj7si4428589pad.74.2014.05.30.00.57.17; Fri, 30 May 2014 00:57:17 -0700 (PDT) Received-SPF: none (google.com: linux-gpio-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751665AbaE3H5R (ORCPT <rfc822;patch@linaro.org> + 1 other); Fri, 30 May 2014 03:57:17 -0400 Received: from mail-we0-f179.google.com ([74.125.82.179]:53411 "EHLO mail-we0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750970AbaE3H5Q (ORCPT <rfc822; linux-gpio@vger.kernel.org>); Fri, 30 May 2014 03:57:16 -0400 Received: by mail-we0-f179.google.com with SMTP id q59so1538082wes.24 for <linux-gpio@vger.kernel.org>; Fri, 30 May 2014 00:57:15 -0700 (PDT) X-Received: by 10.194.249.134 with SMTP id yu6mr19484520wjc.86.1401436635360; Fri, 30 May 2014 00:57:15 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id wu6sm8073882wjb.46.2014.05.30.00.57.13 for <multiple recipients> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 May 2014 00:57:14 -0700 (PDT) From: Linus Walleij <linus.walleij@linaro.org> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: linux-gpio@vger.kernel.org, Linus Walleij <linus.walleij@linaro.org>, Barry Song <Baohua.Song@csr.com> Subject: [PATCH] pinctrl: sirf: fix a bad conflict resolution Date: Fri, 30 May 2014 09:57:11 +0200 Message-Id: <1401436631-30576-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 Sender: linux-gpio-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> X-Mailing-List: linux-gpio@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> |
diff --git a/drivers/pinctrl/sirf/pinctrl-sirf.c b/drivers/pinctrl/sirf/pinctrl-sirf.c index 0e835219c42e..014f5b1fee55 100644 --- a/drivers/pinctrl/sirf/pinctrl-sirf.c +++ b/drivers/pinctrl/sirf/pinctrl-sirf.c @@ -575,7 +575,7 @@ static void sirfsoc_gpio_handle_irq(unsigned int irq, struct irq_desc *desc) int i; for (i = 0; i < SIRFSOC_GPIO_NO_OF_BANKS; i++) { - bank = &sgpio_chip.sgpio_bank[i]; + bank = &sgpio->sgpio_bank[i]; if (bank->parent_irq == irq) break; }
Commit 294d1351ff47726f0f110b88e816cbafe89512fb "pinctrl: sirf: switch to using allocated state container" caused a build conflict due to a bad conflict resolution when cherry-picking the patch. Fix it up. Cc: Barry Song <Baohua.Song@csr.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/pinctrl/sirf/pinctrl-sirf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)