diff options
| author | Jens Axboe <axboe@fb.com> | 2016-09-15 17:38:34 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-09-15 17:38:34 +0300 |
| commit | 474b313de79e034e269955de23231da769a521b7 (patch) | |
| tree | 877e3c883aff3edfe4f378c69f7ba738b0d8ef94 /tools | |
| parent | 2849450ad39d2e699fda2d5c6f41e05d87fd7004 (diff) | |
| parent | ee8d41e53efe14bfc5ea5866e1178b06d78a7c95 (diff) | |
| download | linux-474b313de79e034e269955de23231da769a521b7.tar.xz | |
Merge branch 'irq/for-block' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-4.9/msi-irq
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/iio/iio_generic_buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/iio/iio_generic_buffer.c b/tools/iio/iio_generic_buffer.c index 0e8a1f7a292d..f39c0e9c0d5c 100644 --- a/tools/iio/iio_generic_buffer.c +++ b/tools/iio/iio_generic_buffer.c @@ -348,7 +348,7 @@ int main(int argc, char **argv) int notrigger = 0; char *dummy; - struct iio_channel_info *channels; + struct iio_channel_info *channels = NULL; register_cleanup(); @@ -456,7 +456,7 @@ int main(int argc, char **argv) if (notrigger) { printf("trigger-less mode selected\n"); - } if (trig_num >= 0) { + } else if (trig_num >= 0) { char *trig_dev_name; ret = asprintf(&trig_dev_name, "%strigger%d", iio_dir, trig_num); if (ret < 0) { |