summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-12-26 17:07:06 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-12-26 17:07:06 -0800
commitf744c423cacf8f9666d0390e5068813afff756e5 (patch)
tree20f5a983bbadd22346cfdab88e395c37c97dbf36
parent9f9499ae8e6415cefc4fe0a96ad0e27864353c89 (diff)
parentd590faf9e8f8509a0a0aa79c38e87fcc6b913248 (diff)
downloadlinux-f744c423cacf8f9666d0390e5068813afff756e5.tar.gz
linux-f744c423cacf8f9666d0390e5068813afff756e5.tar.bz2
linux-f744c423cacf8f9666d0390e5068813afff756e5.zip
Merge tag 'iio-fixes-for-4.4c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan writes: 3rd set of IIO fixes for the 4.4 cycle. Only a single fix this time and for a bug that's been in the kernel since around about the start of 2013 (so no rush!) * Out-of-bounds memory access in adis core (Analog Devices IMUs)
-rw-r--r--drivers/iio/imu/adis_buffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/imu/adis_buffer.c b/drivers/iio/imu/adis_buffer.c
index cb32b593f1c5..36607d52fee0 100644
--- a/drivers/iio/imu/adis_buffer.c
+++ b/drivers/iio/imu/adis_buffer.c
@@ -43,7 +43,7 @@ int adis_update_scan_mode(struct iio_dev *indio_dev,
return -ENOMEM;
rx = adis->buffer;
- tx = rx + indio_dev->scan_bytes;
+ tx = rx + scan_count;
spi_message_init(&adis->msg);