summaryrefslogtreecommitdiffstats
path: root/tools/iio
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-12 09:18:04 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-12 09:18:04 +0200
commit8473054e4d2581282230d01d1ae5379cdcf7a4df (patch)
tree4606408a26ebd621ff799ffbc6f07126f7fba6b4 /tools/iio
parentb49f6ab951113cd2263a9d72b420e725e1cbfcf4 (diff)
parent9395452b4aab7bc2475ef8935b4a4fb99d778d70 (diff)
downloadlinux-8473054e4d2581282230d01d1ae5379cdcf7a4df.tar.gz
linux-8473054e4d2581282230d01d1ae5379cdcf7a4df.tar.bz2
linux-8473054e4d2581282230d01d1ae5379cdcf7a4df.zip
Merge 4.8-rc6 into staging-next
We need the IIO changes in here for future patches to build on. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/iio')
-rw-r--r--tools/iio/iio_generic_buffer.c2
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) {