Commit 5b78e513 authored Oct 15, 2013 by Lars-Peter Clausen Committed by Jonathan Cameron Oct 15, 2013

iio:kfifo: Empty buffer on update

The kfifo's request_update callback will free the current buffer and allocate a
new one if the size has changed. This will remove any samples that might still
be left in the buffer. If the size has not changed the buffer content is
left untouched though. This is a bit inconsistent and might cause an application
to see data from a previous capture. This patch inserts a call to
kfifo_reset_out() when the size did not change. This makes sure that any pending
samples are removed from the buffer.

Note, due to a different bug the buffer is currently always re-allocated, even
if the size did not change. So this patch will not change the behavior. In the
next patch the bug will be fixed and this patch makes sure that the current
behavior is kept.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

parent 0894d80d

drivers/iio/kfifo_buf.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -33,15 +33,17 @@ static int iio_request_update_kfifo(struct iio_buffer *r)
		int ret = 0;
		struct iio_kfifo *buf = iio_to_kfifo(r);

		if (!buf->update_needed)
		goto error_ret;
		mutex_lock(&buf->user_lock);
		if (buf->update_needed) {
		kfifo_free(&buf->kf);
		ret = __iio_allocate_kfifo(buf, buf->buffer.bytes_per_datum,
		buf->buffer.length);
		} else {
		kfifo_reset_out(&buf->kf);
		}
		r->stufftoread = false;
		mutex_unlock(&buf->user_lock);
		error_ret:

		return ret;
		}

Admin message