1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index f33063114d56..0dee0e0c247a 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1398,7 +1398,7 @@ static int gpiod_request(struct gpio_desc *desc, const char *label)
         int                     status = -EPROBE_DEFER;
         unsigned long           flags;
 
-        if (!desc || !desc->chip) {
+        if (!desc) {
                 pr_warn("%s: invalid GPIO\n", __func__);
                 return -EINVAL;
         }
@@ -1406,6 +1406,8 @@ static int gpiod_request(struct gpio_desc *desc, const char *label)
         spin_lock_irqsave(&gpio_lock, flags);
 
         chip = desc->chip;
+        if (chip == NULL)
+                goto done;
 
         if (!try_module_get(chip->owner))
                 goto done;