diff options
author | Hartmut Knaack <knaack.h@gmx.de> | 2015-05-31 08:39:49 -0400 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2015-05-31 12:34:05 -0400 |
commit | 5fdb8c6127c3c594360fb5f2959a724809c0032e (patch) | |
tree | e4d479970a72bb4ca332f9515e1ef8ff7cd4a0e7 /tools/iio | |
parent | 2b6a6e67af6f8f644a48f75efc1f44544c0d74f6 (diff) |
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>
Diffstat (limited to 'tools/iio')
-rw-r--r-- | tools/iio/iio_event_monitor.c | 8 |
1 files changed, 5 insertions, 3 deletions
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) | |||
275 | } | 275 | } |
276 | 276 | ||
277 | ret = ioctl(fd, IIO_GET_EVENT_FD_IOCTL, &event_fd); | 277 | ret = ioctl(fd, IIO_GET_EVENT_FD_IOCTL, &event_fd); |
278 | |||
279 | close(fd); | ||
280 | |||
281 | if (ret == -1 || event_fd == -1) { | 278 | if (ret == -1 || event_fd == -1) { |
282 | ret = -errno; | 279 | ret = -errno; |
283 | fprintf(stdout, "Failed to retrieve event fd\n"); | 280 | fprintf(stdout, "Failed to retrieve event fd\n"); |
281 | if (close(fd) == -1) | ||
282 | perror("Failed to close character device file"); | ||
283 | |||
284 | goto error_free_chrdev_name; | 284 | goto error_free_chrdev_name; |
285 | } | 285 | } |
286 | 286 | ||
287 | close(fd); | ||
288 | |||
287 | while (true) { | 289 | while (true) { |
288 | ret = read(event_fd, &event, sizeof(event)); | 290 | ret = read(event_fd, &event, sizeof(event)); |
289 | if (ret == -1) { | 291 | if (ret == -1) { |