iio:kfifo_buf improve error handling in read_first_n.
authorJonathan Cameron <jic23@kernel.org>
Mon, 27 Aug 2012 17:40:04 +0000 (18:40 +0100)
committerJonathan Cameron <jic23@kernel.org>
Mon, 27 Aug 2012 17:58:36 +0000 (18:58 +0100)
These two elements were originally in the patch
iio:kfifo_buf  Take advantage of the fixed record size used in IIO
but Lars-Peter Clausen pointed out they should not have been
so here they are.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Tested-by: Lars-Peter Clausen <lars@metafoo.de>
drivers/iio/kfifo_buf.c

index 8a6d28ce21b2f5102ac3ddae7e9f1ad43b50e85f..6ec763f1202a374d6c4b0d8e81a9faa36d51c83f 100644 (file)
@@ -108,10 +108,12 @@ static int iio_read_first_n_kfifo(struct iio_buffer *r,
        int ret, copied;
        struct iio_kfifo *kf = iio_to_kfifo(r);
 
-       if (n < r->bytes_per_datum)
+       if (n < r->bytes_per_datum || r->bytes_per_datum == 0)
                return -EINVAL;
 
        ret = kfifo_to_user(&kf->kf, buf, n, &copied);
+       if (ret < 0)
+               return ret;
 
        return copied;
 }