1 files changed, 9 insertions, 0 deletions

diff --git a/tools/iio/generic_buffer.c b/tools/iio/generic_buffer.c
index eb89bc2ca5d0..93ac93f74549 100644
--- a/tools/iio/generic_buffer.c
+++ b/tools/iio/generic_buffer.c
@@ -206,13 +206,22 @@ int main(int argc, char **argv)
                         noevents = 1;
                         break;
                 case 'c':
+                        errno = 0;
                         num_loops = strtoul(optarg, &dummy, 10);
+                        if (errno)
+                                return -errno;
                         break;
                 case 'w':
+                        errno = 0;
                         timedelay = strtoul(optarg, &dummy, 10);
+                        if (errno)
+                                return -errno;
                         break;
                 case 'l':
+                        errno = 0;
                         buf_len = strtoul(optarg, &dummy, 10);
+                        if (errno)
+                                return -errno;
                         break;
                 case 'g':
                         notrigger = 1;