diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-27 09:13:38 +0900 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-27 09:13:38 +0900 |
commit | cf516d08eceb4c442f0f2f1a73ebf994b1dbf0ed (patch) | |
tree | a56d5024a453bb323039f7c481ac17738269e24f /drivers/staging/iio/accel/sca3000_ring.c | |
parent | 047e6646579c2853afba0111f573796daf4fd485 (diff) | |
parent | 32b88194f71d6ae7768a29f87fbba454728273ee (diff) |
Merge 4.3-rc7 into staging-next
We want the other staging patches in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/iio/accel/sca3000_ring.c')
-rw-r--r-- | drivers/staging/iio/accel/sca3000_ring.c | 2 |
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 6d19e127cf40..ac35d031f81b 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)) |