From: Hartmut Knaack <knaack.h@gmx.de>
Date: Sun, 31 May 2015 12:39:49 +0000 (+0200)
Subject: tools:iio:iio_event_monitor: save right errno
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5fdb8c6127c3c594360fb5f2959a724809c0032e;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

tools:iio:iio_event_monitor: save right errno

Move up error handling code to preserve the errno coming from ioctl(),
before it may be changed by close().

Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---

diff --git a/tools/iio/iio_event_monitor.c b/tools/iio/iio_event_monitor.c
index f6fdab48d340..578390db1bec 100644
--- a/tools/iio/iio_event_monitor.c
+++ b/tools/iio/iio_event_monitor.c
@@ -275,15 +275,17 @@ int main(int argc, char **argv)
 	}
 
 	ret = ioctl(fd, IIO_GET_EVENT_FD_IOCTL, &event_fd);
-
-	close(fd);
-
 	if (ret == -1 || event_fd == -1) {
 		ret = -errno;
 		fprintf(stdout, "Failed to retrieve event fd\n");
+		if (close(fd) == -1)
+			perror("Failed to close character device file");
+
 		goto error_free_chrdev_name;
 	}
 
+	close(fd);
+
 	while (true) {
 		ret = read(event_fd, &event, sizeof(event));
 		if (ret == -1) {