History

Merge tag 'staging-4.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging/IIO fixes from Greg KH: "Here are a few small staging and IIO driver fixes for 4.18-rc3. Nothing major or big, all just fixes for reported problems since 4.18-rc1. All of these have been in linux-next this week with no reported problems" * tag 'staging-4.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: android: ion: Return an ERR_PTR in ion_map_kernel staging: comedi: quatech_daqp_cs: fix no-op loop daqp_ao_insn_write() iio: imu: inv_mpu6050: Fix probe() failure on older ACPI based machines iio: buffer: fix the function signature to match implementation iio: mma8452: Fix ignoring MMA8452_INT_DRDY iio: tsl2x7x/tsl2772: avoid potential division by zero iio: pressure: bmp280: fix relative humidity unit

Linus Torvalds committed 8 years ago

Commit d7563ca2 parents 652788a ebc2dc57 files · +10 −7Browse files

Showing the changes to include/linux (1 of 7 files). Show all

Unified · Split

include/linux/iio/buffer-dma.h+1−1
@@ -141,7 +141,7 @@ int iio_dma_buffer_read(struct iio_buffer *buffer, size_t n, · 140 unmodified lines
141141 char __user *user_buffer);
142142 size_t iio_dma_buffer_data_available(struct iio_buffer *buffer);
143143 int iio_dma_buffer_set_bytes_per_datum(struct iio_buffer *buffer, size_t bpd);
144−int iio_dma_buffer_set_length(struct iio_buffer *buffer, int length);
144+int iio_dma_buffer_set_length(struct iio_buffer *buffer, unsigned int length);
145145 int iio_dma_buffer_request_update(struct iio_buffer *buffer);
146146
147147 int iio_dma_buffer_init(struct iio_dma_buffer_queue *queue,