summaryrefslogtreecommitdiffstats
path: root/tools/iio
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-03-24 09:39:14 +0100
committerJonathan Cameron <jic23@kernel.org>2016-04-03 10:27:49 +0100
commit793d6b5ea80c9bba8de40b720991b436fa5e174d (patch)
tree044c625ff287e2935f31329812f0a4827b1d0bd0 /tools/iio
parentfb12b6c725a3936bedaa7fac87432f0ad0d01599 (diff)
downloadlinux-stable-793d6b5ea80c9bba8de40b720991b436fa5e174d.tar.gz
linux-stable-793d6b5ea80c9bba8de40b720991b436fa5e174d.tar.bz2
linux-stable-793d6b5ea80c9bba8de40b720991b436fa5e174d.zip
iio: tools: make generic_buffer look for "-trigger"
All the ST Sensors use the old "<foo>-trigger" rather than the standard "<foo>-devN" new standard suffix for triggers. Now much to do about it since it is ABI, but make the testing tools recognize it too. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'tools/iio')
-rw-r--r--tools/iio/generic_buffer.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/tools/iio/generic_buffer.c b/tools/iio/generic_buffer.c
index 01c4f67801e0..c42b7f836b48 100644
--- a/tools/iio/generic_buffer.c
+++ b/tools/iio/generic_buffer.c
@@ -304,7 +304,19 @@ int main(int argc, char **argv)
}
}
- /* Verify the trigger exists */
+ /* Look for this "-devN" trigger */
+ trig_num = find_type_by_name(trigger_name, "trigger");
+ if (trig_num < 0) {
+ /* OK try the simpler "-trigger" suffix instead */
+ free(trigger_name);
+ ret = asprintf(&trigger_name,
+ "%s-trigger", device_name);
+ if (ret < 0) {
+ ret = -ENOMEM;
+ goto error_free_dev_dir_name;
+ }
+ }
+
trig_num = find_type_by_name(trigger_name, "trigger");
if (trig_num < 0) {
fprintf(stderr, "Failed to find the trigger %s\n",