From mboxrd@z Thu Jan 1 00:00:00 1970 From: "G, Manjunath Kondaiah" Subject: [PATCH 4/5] gpiolib: handle deferral probe error Date: Fri, 07 Oct 2011 10:05:26 +0500 Message-ID: <1317962127-29003-5-git-send-email-manjugk@ti.com> References: <1317962127-29003-1-git-send-email-manjugk@ti.com> Return-path: Received: from [117.192.88.236] ([117.192.88.236]:35652 "EHLO manju-desktop" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751152Ab1JGElU (ORCPT ); Fri, 7 Oct 2011 00:41:20 -0400 Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: linux-arm-kernel@lists.infradead.org Cc: linux-omap@vger.kernel.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Grant Likely , Greg Kroah-Hartman , Dilan Lee , Mark Brown , Manjunath GKondaiah , Arnd Bergmann The gpio library should return -EPROBE_DEFER in gpio_request if gpio driver is not ready. If drivers pass this error code through to their caller (which they really should) then this will ensure that the probe is retried later when further devices become available. Signed-off-by: G, Manjunath Kondaiah --- Cc: linux-omap@vger.kernel.org Cc: linux-mmc@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: Grant Likely Cc: Greg Kroah-Hartman Cc: Dilan Lee Cc: Mark Brown Cc: Manjunath GKondaiah Cc: Arnd Bergmann drivers/gpio/gpiolib.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index a971e3d..9081ef8 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1177,13 +1177,15 @@ int gpio_request(unsigned gpio, const char *label) { struct gpio_desc *desc; struct gpio_chip *chip; - int status = -EINVAL; + int status = -EPROBE_DEFER; unsigned long flags; spin_lock_irqsave(&gpio_lock, flags); - if (!gpio_is_valid(gpio)) + if (!gpio_is_valid(gpio)) { + status = -EINVAL; goto done; + } desc = &gpio_desc[gpio]; chip = desc->chip; if (chip == NULL) -- 1.7.4.1