2 files changed, 14 insertions, 2 deletions

diff --git a/drivers/gpio/gpiolib-legacy.c b/drivers/gpio/gpiolib-legacy.c
index 078ae6c2df79..8b830996fe02 100644
--- a/drivers/gpio/gpiolib-legacy.c
+++ b/drivers/gpio/gpiolib-legacy.c
@@ -24,6 +24,10 @@ int gpio_request_one(unsigned gpio, unsigned long flags, const char *label)
 
         desc = gpio_to_desc(gpio);
 
+        /* Compatibility: assume unavailable "valid" GPIOs will appear later */
+        if (!desc && gpio_is_valid(gpio))
+                return -EPROBE_DEFER;
+
         err = gpiod_request(desc, label);
         if (err)
                 return err;
@@ -62,7 +66,13 @@ EXPORT_SYMBOL_GPL(gpio_request_one);
 
 int gpio_request(unsigned gpio, const char *label)
 {
-        return gpiod_request(gpio_to_desc(gpio), label);
+        struct gpio_desc *desc = gpio_to_desc(gpio);
+
+        /* Compatibility: assume unavailable "valid" GPIOs will appear later */
+        if (!desc && gpio_is_valid(gpio))
+                return -EPROBE_DEFER;
+
+        return gpiod_request(desc, label);
 }
 EXPORT_SYMBOL_GPL(gpio_request);
 
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 0b271ef87c09..56b7c5de95a0 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -77,7 +77,9 @@ struct gpio_desc *gpio_to_desc(unsigned gpio)
 
         spin_unlock_irqrestore(&gpio_lock, flags);
 
-        WARN(1, "invalid GPIO %d\n", gpio);
+        if (!gpio_is_valid(gpio))
+                WARN(1, "invalid GPIO %d\n", gpio);
+
         return NULL;
 }
 EXPORT_SYMBOL_GPL(gpio_to_desc);