From patchwork Wed Jan 16 15:56:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herton Ronaldo Krzesinski X-Patchwork-Id: 212767 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id BBB082C0087 for ; Thu, 17 Jan 2013 03:10:27 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TvVZA-0006xy-7b; Wed, 16 Jan 2013 16:10:16 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TvVYr-0006mw-Bu for kernel-team@lists.ubuntu.com; Wed, 16 Jan 2013 16:09:57 +0000 Received: from [177.132.109.150] (helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1TvVYq-0007Jp-Fa; Wed, 16 Jan 2013 16:09:57 +0000 From: Herton Ronaldo Krzesinski To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Subject: [PATCH 194/222] Input: gpio_keys - defer probing if GPIO probing is deferred Date: Wed, 16 Jan 2013 13:56:34 -0200 Message-Id: <1358351822-7675-195-git-send-email-herton.krzesinski@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1358351822-7675-1-git-send-email-herton.krzesinski@canonical.com> References: <1358351822-7675-1-git-send-email-herton.krzesinski@canonical.com> X-Extended-Stable: 3.5 Cc: Dmitry Torokhov X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 3.5.7.3 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Dmitry Torokhov commit e324ce61ef483dd26d03502d35666ad48a2e1b33 upstream. If of_get_gpio_flags() returns an error (as in case when GPIO probe is deferred) the driver would attempt to claim invalid GPIO. It should propagate the error code up the stack instead so that the probe either fails or will be retried later (in case of -EPROBE_DEFER). Reported-by: Gabor Juhos Signed-off-by: Dmitry Torokhov [ herton: backport for 3.5: * adjust context, different error handling and return type in gpio_keys_get_devtree_pdata function * drop check for EPROBE_DEFER, of_get_gpio_flags doesn't return it on 3.5. The patch just will return an error, no deferring is done. ] Signed-off-by: Herton Ronaldo Krzesinski --- drivers/input/keyboard/gpio_keys.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index 62bfce4..4f5cce8 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -548,6 +548,7 @@ static int gpio_keys_get_devtree_pdata(struct device *dev, struct device_node *node, *pp; int i; struct gpio_keys_button *buttons; + int error = -ENODEV; u32 reg; node = dev->of_node; @@ -574,6 +575,7 @@ static int gpio_keys_get_devtree_pdata(struct device *dev, pp = NULL; i = 0; while ((pp = of_get_next_child(node, pp))) { + int gpio; enum of_gpio_flags flags; if (!of_find_property(pp, "gpios", NULL)) { @@ -581,7 +583,17 @@ static int gpio_keys_get_devtree_pdata(struct device *dev, dev_warn(dev, "Found button without gpios\n"); continue; } - buttons[i].gpio = of_get_gpio_flags(pp, 0, &flags); + + gpio = of_get_gpio_flags(pp, 0, &flags); + if (gpio < 0) { + error = gpio; + dev_err(dev, + "Failed to get gpio flags, error: %d\n", + error); + goto out_fail; + } + + buttons[i].gpio = gpio; buttons[i].active_low = flags & OF_GPIO_ACTIVE_LOW; if (of_property_read_u32(pp, "linux,code", ®)) { @@ -613,7 +625,7 @@ static int gpio_keys_get_devtree_pdata(struct device *dev, out_fail: kfree(buttons); - return -ENODEV; + return error; } static struct of_device_id gpio_keys_of_match[] = {