diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-08 08:05:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-08 08:05:16 -0400 |
| commit | 950d8381d915ee293a5b57f91e59dd8115684af1 (patch) | |
| tree | 6a611a808da1e28c3db740ac9a54c01757af2e56 /tools | |
| parent | 979515c5645830465739254abc1b1648ada41518 (diff) | |
| parent | d71f058617564750261b673ea9b3352382b9cde4 (diff) | |
Merge branch 'linus' into timers/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools')
| -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 0e8a1f7a292d..ae68bf0e2d51 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) | |||
| 348 | int notrigger = 0; | 348 | int notrigger = 0; |
| 349 | char *dummy; | 349 | char *dummy; |
| 350 | 350 | ||
| 351 | struct iio_channel_info *channels; | 351 | struct iio_channel_info *channels = NULL; |
| 352 | 352 | ||
| 353 | register_cleanup(); | 353 | register_cleanup(); |
| 354 | 354 | ||