On Wed, Dec 4, 2019 at 6:05 PM Bartosz Golaszewski <brgl@xxxxxxxx> wrote: > > From: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx> > > Unduplicate the ngpio check by simply calling gpiochip_get_desc() and > checking its return value. > Reviewed-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx> > Signed-off-by: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx> > --- > drivers/gpio/gpiolib.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c > index 6ef55cc1188b..17796437d7be 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; > -- > 2.23.0 > -- With Best Regards, Andy Shevchenko