diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-11 23:23:48 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-11 23:23:48 +0200 |
| commit | 2afe669acdcea66d95b94bbcdc1412210ea218d6 (patch) | |
| tree | 5a2f20b683bc065375aa3a31c47718711f611c14 /tools/iio/iio_generic_buffer.c | |
| parent | Merge tag 'usb-4.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
| parent | Merge tag 'iio-fixes-for-4.8b' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | linux-2afe669acdcea66d95b94bbcdc1412210ea218d6.tar.xz linux-2afe669acdcea66d95b94bbcdc1412210ea218d6.zip | |
Merge tag 'staging-4.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull IIO fixes from Greg KH:
"Here are a few small IIO fixes for 4.8-rc6.
Nothing major, full details are in the shortlog, all of these have
been in linux-next with no reported issues"
* tag 'staging-4.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
iio:core: fix IIO_VAL_FRACTIONAL sign handling
iio: ensure ret is initialized to zero before entering do loop
iio: accel: kxsd9: Fix scaling bug
iio: accel: bmc150: reset chip at init time
iio: fix pressure data output unit in hid-sensor-attributes
tools:iio:iio_generic_buffer: fix trigger-less mode
Diffstat (limited to 'tools/iio/iio_generic_buffer.c')
| -rw-r--r-- | tools/iio/iio_generic_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/iio/iio_generic_buffer.c b/tools/iio/iio_generic_buffer.c index ae68bf0e2d51..f39c0e9c0d5c 100644 --- a/tools/iio/iio_generic_buffer.c +++ b/tools/iio/iio_generic_buffer.c @@ -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) { |