diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-06-26 07:45:52 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-06-26 07:45:52 +0800 |
| commit | ebc2dc5f9b231c1b64047c6717cd464104f086f4 (patch) | |
| tree | 056fb158e09b85888bd96b7e81e33617531ab2d4 /include/linux | |
| parent | staging: android: ion: Return an ERR_PTR in ion_map_kernel (diff) | |
| parent | iio: imu: inv_mpu6050: Fix probe() failure on older ACPI based machines (diff) | |
| download | linux-dev-ebc2dc5f9b231c1b64047c6717cd464104f086f4.tar.xz linux-dev-ebc2dc5f9b231c1b64047c6717cd464104f086f4.zip | |
Merge tag 'iio-fixes-4.18a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan writes:
First set of IIO fixes for the 4.18 cycle.
* bmp280
- Fix wrong relative humidity unit.
* buffer
- Fix a function signature to match the function.
* inv_mpu6050
- Fix a regression in which older ACPI devices won't have working
interrupts due to lack of information on the interrupt type.
* mma8452
- Don't ignore data ready interrupt when handling interrupts as will
look like an unhandled interrupt.
* tsl2x7x/tsl2772
- Avoid a potential division by zero.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/iio/buffer-dma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/iio/buffer-dma.h b/include/linux/iio/buffer-dma.h index 767467d886de..67c75372b691 100644 --- a/include/linux/iio/buffer-dma.h +++ b/include/linux/iio/buffer-dma.h @@ -141,7 +141,7 @@ int iio_dma_buffer_read(struct iio_buffer *buffer, size_t n, char __user *user_buffer); size_t iio_dma_buffer_data_available(struct iio_buffer *buffer); int iio_dma_buffer_set_bytes_per_datum(struct iio_buffer *buffer, size_t bpd); -int iio_dma_buffer_set_length(struct iio_buffer *buffer, int length); +int iio_dma_buffer_set_length(struct iio_buffer *buffer, unsigned int length); int iio_dma_buffer_request_update(struct iio_buffer *buffer); int iio_dma_buffer_init(struct iio_dma_buffer_queue *queue, |