iio:iio_buffer_init(): Only set watermark if not already set
authorLars-Peter Clausen <lars@metafoo.de>
Tue, 13 Oct 2015 16:10:25 +0000 (18:10 +0200)
committerJonathan Cameron <jic23@kernel.org>
Sun, 25 Oct 2015 13:50:42 +0000 (13:50 +0000)
Only initialize the watermark field if it is still 0. This allows drivers
to provide a custom default watermark value. E.g. some driver might have a
fixed watermark or can only support watermarks within a certain range and
the initial value for the watermark should be within this range.

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

index 7340922d367fe3a126584ea2f5c2e590dc27c99a..5f2c8c8c436e551bcce39c33b779a67d463f6bef 100644 (file)
@@ -193,7 +193,8 @@ void iio_buffer_init(struct iio_buffer *buffer)
        INIT_LIST_HEAD(&buffer->buffer_list);
        init_waitqueue_head(&buffer->pollq);
        kref_init(&buffer->ref);
-       buffer->watermark = 1;
+       if (!buffer->watermark)
+               buffer->watermark = 1;
 }
 EXPORT_SYMBOL(iio_buffer_init);