Merge 4.3-rc7 into staging-next

[firefly-linux-kernel-4.4.55.git] / drivers / staging / iio / accel / sca3000_ring.c

diff --git a/drivers/staging/iio/accel/sca3000_ring.c b/drivers/staging/iio/accel/sca3000_ring.c
index 23685e74917e2a5c3f3ab6dc6542f48d5ecbb2a9..ac35d031f81b44c699c0948ebe3b8dea5342c746 100644 (file)
--- 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))
@@ -267,7 +267,7 @@ int sca3000_configure_ring(struct iio_dev *indio_dev)
        struct iio_buffer *buffer;
 
        buffer = sca3000_rb_allocate(indio_dev);
-       if (buffer == NULL)
+       if (!buffer)
                return -ENOMEM;
        indio_dev->modes |= INDIO_BUFFER_HARDWARE;