1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 43aeb07343ec..d8ccb500872f 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -497,7 +497,7 @@ static int linehandle_create(struct gpio_device *gdev, void __user *ip)
         struct gpiohandle_request handlereq;
         struct linehandle_state *lh;
         struct file *file;
-        int fd, i, ret;
+        int fd, i, count = 0, ret;
         u32 lflags;
 
         if (copy_from_user(&handlereq, ip, sizeof(handlereq)))
@@ -558,6 +558,7 @@ static int linehandle_create(struct gpio_device *gdev, void __user *ip)
                 if (ret)
                         goto out_free_descs;
                 lh->descs[i] = desc;
+                count = i;
 
                 if (lflags & GPIOHANDLE_REQUEST_ACTIVE_LOW)
                         set_bit(FLAG_ACTIVE_LOW, &desc->flags);
@@ -628,7 +629,7 @@ static int linehandle_create(struct gpio_device *gdev, void __user *ip)
 out_put_unused_fd:
         put_unused_fd(fd);
 out_free_descs:
-        for (; i >= 0; i--)
+        for (i = 0; i < count; i++)
                 gpiod_free(lh->descs[i]);
         kfree(lh->label);
 out_free_lh:
@@ -902,7 +903,7 @@ 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_desc;
+                goto out_free_label;
         le->desc = desc;
         le->eflags = eflags;