1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 4e10b10d3ddd..c6326e44e2c0 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -150,9 +150,10 @@ EXPORT_SYMBOL_GPL(gpio_to_desc);
 static struct gpio_desc *gpiochip_offset_to_desc(struct gpio_chip *chip,
                                                  unsigned int offset)
 {
-        unsigned int gpio = chip->base + offset;
+        if (offset >= chip->ngpio)
+                return ERR_PTR(-EINVAL);
 
-        return gpio_to_desc(gpio);
+        return &chip->desc[offset];
 }
 
 /**