From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752818AbcEJPiN (ORCPT ); Tue, 10 May 2016 11:38:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54999 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752718AbcEJPiG (ORCPT ); Tue, 10 May 2016 11:38:06 -0400 From: Benjamin Tissoires To: Dmitry Torokhov , Wei Yongjun Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Bastien Nocera , Alexandre Courbot , Lejun Zhu Subject: [PATCH 3/3] Input - soc_button_array: make sure one GPIO is not assigned twice Date: Tue, 10 May 2016 17:37:53 +0200 Message-Id: <1462894673-26560-4-git-send-email-benjamin.tissoires@redhat.com> In-Reply-To: <1462894673-26560-1-git-send-email-benjamin.tissoires@redhat.com> References: <1462894673-26560-1-git-send-email-benjamin.tissoires@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 10 May 2016 15:38:05 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Surface 3 declares twice the GPIO as GpioInt and GpioIo in its ACPI table. Given that we do not keep the gpiod around, but the actual number associated to, there is a chance while enumerating the GPIOs that one gets assigned twice. Make sure a previous button has not been mapped already to the current button to prevent such failure. Signed-off-by: Benjamin Tissoires --- drivers/input/misc/soc_button_array.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c index 70002a3..f2f75cf 100644 --- a/drivers/input/misc/soc_button_array.c +++ b/drivers/input/misc/soc_button_array.c @@ -77,7 +77,7 @@ soc_button_device_create(struct platform_device *pdev, struct gpio_keys_platform_data *gpio_keys_pdata; int n_buttons = 0; int gpio; - int error; + int i, error; gpio_keys_pdata = devm_kzalloc(&pdev->dev, sizeof(*gpio_keys_pdata) + @@ -96,6 +96,13 @@ soc_button_device_create(struct platform_device *pdev, if (gpio_is_valid(gpio)) continue; + for (i = 0; i < n_buttons; i++) { + if (gpio_keys[i].gpio == gpio) + break; + } + if (i < n_buttons) + continue; /* the GPIO has already been assigned */ + gpio_keys[n_buttons].type = info->event_type; gpio_keys[n_buttons].code = info->event_code; gpio_keys[n_buttons].gpio = gpio; -- 2.5.0