On 10/15/13 09:30, Lars-Peter Clausen wrote:
> 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@xxxxxxxxxx>
Applied to the togreg branch of iio.git
Thanks,
> ---
> Changes since v1:
> * Do re-allocation in the if branch, reset in the else branch
> ---
> drivers/iio/kfifo_buf.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/iio/kfifo_buf.c b/drivers/iio/kfifo_buf.c
> index c95b61f..d654f42 100644
> --- a/drivers/iio/kfifo_buf.c
> +++ b/drivers/iio/kfifo_buf.c
> @@ -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);
> - kfifo_free(&buf->kf);
> - ret = __iio_allocate_kfifo(buf, buf->buffer.bytes_per_datum,
> + 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;
> }
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
