Skip to content

Commit 0f41dab

Browse files
committed
gpiolib: use gpiochip_get_desc() in linehandle_create()
Unduplicate the ngpio 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 0686362 commit 0f41dab

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

drivers/gpio/gpiolib.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -678,14 +678,13 @@ static int linehandle_create(struct gpio_device *gdev, void __user *ip)
678678
/* Request each GPIO */
679679
for (i = 0; i < handlereq.lines; i++) {
680680
u32 offset = handlereq.lineoffsets[i];
681-
struct gpio_desc *desc;
681+
struct gpio_desc *desc = gpiochip_get_desc(gdev->chip, offset);
682682

683-
if (offset >= gdev->ngpio) {
684-
ret = -EINVAL;
683+
if (IS_ERR(desc)) {
684+
ret = PTR_ERR(desc);
685685
goto out_free_descs;
686686
}
687687

688-
desc = &gdev->descs[offset];
689688
ret = gpiod_request(desc, lh->label);
690689
if (ret)
691690
goto out_free_descs;

0 commit comments

Comments
 (0)