On 13/10/15 17:10, Lars-Peter Clausen wrote: > 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@xxxxxxxxxx> Applied. > --- > drivers/iio/industrialio-buffer.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c > index 7340922..5f2c8c8 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); > > -- 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
