tools: gpio: fix spurious close warning in gpio-utils
authorKent Gibson <warthog618@gmail.com>
Wed, 8 Jul 2020 04:15:59 +0000 (12:15 +0800)
committerBartosz Golaszewski <bgolaszewski@baylibre.com>
Sun, 12 Jul 2020 08:22:01 +0000 (10:22 +0200)
Fix bogus close warning that occurs when opening the character device
fails.

Signed-off-by: Kent Gibson <warthog618@gmail.com>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
tools/gpio/gpio-utils.c

index 0600378..16a5d9c 100644 (file)
@@ -75,7 +75,7 @@ int gpiotools_request_linehandle(const char *device_name, unsigned int *lines,
                ret = -errno;
                fprintf(stderr, "Failed to open %s, %s\n",
                        chrdev_name, strerror(errno));
-               goto exit_close_error;
+               goto exit_free_name;
        }
 
        for (i = 0; i < nlines; i++)
@@ -94,9 +94,9 @@ int gpiotools_request_linehandle(const char *device_name, unsigned int *lines,
                        "GPIO_GET_LINEHANDLE_IOCTL", ret, strerror(errno));
        }
 
-exit_close_error:
        if (close(fd) == -1)
                perror("Failed to close GPIO character device file");
+exit_free_name:
        free(chrdev_name);
        return ret < 0 ? ret : req.fd;
 }