summaryrefslogtreecommitdiffstats
path: root/drivers/staging/iio/accel/sca3000_ring.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-10-24 07:51:13 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2015-10-24 07:51:13 +0900
commit4ee8019d3fdc6cce14129a954632c0f81d456884 (patch)
tree9b9061e01f1a57ee3572c2f80e01746a4f0eca7f /drivers/staging/iio/accel/sca3000_ring.c
parent410694e214d5b479bc8b035ded0bb832f1c469b4 (diff)
parent4301de3b0ac4614fdf629fa414fb94f598e7ad6f (diff)
downloadop-kernel-dev-4ee8019d3fdc6cce14129a954632c0f81d456884.zip
op-kernel-dev-4ee8019d3fdc6cce14129a954632c0f81d456884.tar.gz
Merge tag 'staging-4.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver fixes from Greg KH: "Here are four iio driver fixes for 4.3-rc7, fixing some reported issues. All of these have been in linux-next for a while" * tag 'staging-4.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: iio: mxs-lradc: Fix temperature offset iio: accel: sca3000: memory corruption in sca3000_read_first_n_hw_rb() iio: st_accel: fix interrupt handling on LIS3LV02 iio: adc: twl4030: Fix ADC[3:6] readings
Diffstat (limited to 'drivers/staging/iio/accel/sca3000_ring.c')
-rw-r--r--drivers/staging/iio/accel/sca3000_ring.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/iio/accel/sca3000_ring.c b/drivers/staging/iio/accel/sca3000_ring.c
index 23685e7..bd2c69f 100644
--- a/drivers/staging/iio/accel/sca3000_ring.c
+++ b/drivers/staging/iio/accel/sca3000_ring.c
@@ -116,7 +116,7 @@ static int sca3000_read_first_n_hw_rb(struct iio_buffer *r,
if (ret)
goto error_ret;
- for (i = 0; i < num_read; i++)
+ for (i = 0; i < num_read / sizeof(u16); i++)
*(((u16 *)rx) + i) = be16_to_cpup((__be16 *)rx + i);
if (copy_to_user(buf, rx, num_read))
OpenPOWER on IntegriCloud