Skip to contentSkip to conversation

patch "iio: fix config watermark initial value" added to staging-linus

PATCH [email protected] 1 participant 1 message Apr 4, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

iio: fix config watermark initial value

to my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

Quoted 1 line

From 1bef2c1d4e4fd92bdf8219b13ba97ba861618254 Mon Sep 17 00:00:00 2001

From: Irina Tirdea <[email protected]>
Date: Thu, 24 Mar 2016 11:09:45 +0200
Subject: iio: fix config watermark initial value

config structure is set to 0 when updating the buffers, so by default config->watermark will be 0. When computing the minimum between config->watermark and the buffer->watermark or insert_buffer-watermark, this will always be 0 regardless of the value set by the user for the buffer.

Set as initial value for config->watermark the maximum allowed value so that the minimum value will always be set from one of the buffers.

Fixes f0566c0c405d ("iio: Set device watermark based on watermark of all

attached buffers")

---
 drivers/iio/industrialio-buffer.c | 1 +
 1 file changed, 1 insertion(+)
drivers/iio/industrialio-buffer.c +1 -0
index b976332d45d3..90462fcf5436 100644
@@ -653,6 +653,7 @@ static int iio_verify_update(struct iio_dev *indio_dev,
 	unsigned int modes;
 
 	memset(config, 0, sizeof(*config));
+	config->watermark = ~0;
 
 	/*
 	 * If there is just one buffer and we are removing it there is nothing
Signature · 1 line
2.8.0