From: Lars-Peter Clausen Date: Tue, 13 Oct 2015 16:10:25 +0000 (+0200) Subject: iio:iio_buffer_init(): Only set watermark if not already set X-Git-Tag: v4.5-rc1~122^2~307^2~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a60535726d90bfad16b5c52dcffaeede9fb84a9;p=thirdparty%2Fkernel%2Flinux.git iio:iio_buffer_init(): Only set watermark if not already set 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 Signed-off-by: Jonathan Cameron --- diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c index 7340922d367fe..5f2c8c8c436e5 100644 --- a/drivers/iio/industrialio-buffer.c +++ b/drivers/iio/industrialio-buffer.c @@ -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);