Skip to content

Commit 2a2cabd

Browse files
committed
gpiolib: use gpiochip_get_desc() in gpio_ioctl()
Unduplicate the offset check by simply calling gpiochip_get_desc() and checking its return value. Signed-off-by: Bartosz Golaszewski <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Reviewed-by: Linus Walleij <[email protected]>
1 parent 45e2360 commit 2a2cabd

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/gpio/gpiolib.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,10 +1175,11 @@ static long gpio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
11751175

11761176
if (copy_from_user(&lineinfo, ip, sizeof(lineinfo)))
11771177
return -EFAULT;
1178-
if (lineinfo.line_offset >= gdev->ngpio)
1179-
return -EINVAL;
11801178

1181-
desc = &gdev->descs[lineinfo.line_offset];
1179+
desc = gpiochip_get_desc(chip, lineinfo.line_offset);
1180+
if (IS_ERR(desc))
1181+
return PTR_ERR(desc);
1182+
11821183
if (desc->name) {
11831184
strncpy(lineinfo.name, desc->name,
11841185
sizeof(lineinfo.name));

0 commit comments

Comments
 (0)