summaryrefslogtreecommitdiffstats
path: root/drivers/iio/imu
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-31 17:00:27 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-31 17:00:27 -0800
commit8c4e378e426d1b065a1e8d9f45b8bcc4905d3410 (patch)
tree1d677fb5d7cc7f39f3705ea9969c14e196aba965 /drivers/iio/imu
parentf3ca903fbbb0d26221a39cbebfe6dd4efbebd3ef (diff)
parent88867e3d0b7eea256c1cd432b0a3c7a21e8edf07 (diff)
downloadlinux-8c4e378e426d1b065a1e8d9f45b8bcc4905d3410.tar.bz2
Merge tag 'staging-4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging fixes from Greg KH: "Here are some small staging driver fixes for 4.5-rc2. One of them predated 4.4-final, but I missed that merge window due to the holliday. The others fix reported issues that have come up recently. The tty change is needed for the speakup driver fix and has the ack of the tty driver maintainer as well, i.e. myself :) All have been in linux-next with no reported issues" * tag 'staging-4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: Staging: speakup: fix read scrolled-back VT Staging: speakup: Fix getting port information Revert "Staging: panel: usleep_range is preferred over udelay" iio: adis_buffer: Fix out-of-bounds memory access
Diffstat (limited to 'drivers/iio/imu')
-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);