From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Date: Tue, 24 Dec 2019 12:07:01 +0000 (+0100)
Subject: gpiolib: use gpiochip_get_desc() in lineevent_create()
X-Git-Tag: v5.6-rc1~142^2~19^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45e2360480b939173af70a2221ab63ffdaa1d325;p=thirdparty%2Fkernel%2Flinux.git

gpiolib: use gpiochip_get_desc() in lineevent_create()

Unduplicate the ngpio check by simply calling gpiochip_get_desc() and
checking its return value.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 166160cc9956c..a11c4ee3e47f9 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1009,8 +1009,9 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip)
 	lflags = eventreq.handleflags;
 	eflags = eventreq.eventflags;
 
-	if (offset >= gdev->ngpio)
-		return -EINVAL;
+	desc = gpiochip_get_desc(gdev->chip, offset);
+	if (IS_ERR(desc))
+		return PTR_ERR(desc);
 
 	/* Return an error if a unknown flag is set */
 	if ((lflags & ~GPIOHANDLE_REQUEST_VALID_FLAGS) ||
@@ -1048,7 +1049,6 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip)
 		}
 	}
 
-	desc = &gdev->descs[offset];
 	ret = gpiod_request(desc, le->label);
 	if (ret)
 		goto out_free_label;