diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-03 13:10:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-03 13:10:41 +0100 |
| commit | 6d923f8fe821c0c6b5378635cbcc9da5f5ec520a (patch) | |
| tree | 989514e51f10fd95713ef312a2ed8cd5d563db1a /tools | |
| parent | Revert "staging: erofs: keep corrupted fs from crashing kernel in erofs_namei()" (diff) | |
| parent | iio: ti-ads8688: Update buffer allocation for timestamps (diff) | |
| download | linux-6d923f8fe821c0c6b5378635cbcc9da5f5ec520a.tar.xz linux-6d923f8fe821c0c6b5378635cbcc9da5f5ec520a.zip | |
Merge tag 'iio-fixes-5.0a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan writes:
First set of IIO fixes for the 5.0 cycle.
Been a busy month, so these are rather later than they should have been.
* atlas-ph-sensor:
- Temperature scale didn't correspond to the ABI.
* axp288:
- A few different fixes around the TS-pin handling.
* ti-ads8688
- Not enough space in the buffer used to build the scan to allow for
the timestamp.
* tools - iio_generic_buffer
- Make num_loops signed so that we really are running for ever
rather than just a long time when we specify -1.
* tag 'iio-fixes-5.0a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio:
iio: ti-ads8688: Update buffer allocation for timestamps
tools: iio: iio_generic_buffer: make num_loops signed
iio: adc: axp288: Fix TS-pin handling
iio: chemical: atlas-ph-sensor: correct IIO_TEMP values to millicelsius
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 3040830d7797..84545666a09c 100644 --- a/tools/iio/iio_generic_buffer.c +++ b/tools/iio/iio_generic_buffer.c @@ -330,7 +330,7 @@ static const struct option longopts[] = { int main(int argc, char **argv) { - unsigned long long num_loops = 2; + long long num_loops = 2; unsigned long timedelay = 1000000; unsigned long buf_len = 128; |