Patch "iio: adis16400: Use != channel indices for the two voltage channels" has been added to the 3.10-stable tree

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

    iio: adis16400: Use != channel indices for the two voltage channels

to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
iio-adis16400-use-channel-indices-for-the-two-voltage-channels.patch
and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Paul Cercueil <[email protected]>
Date: Fri, 15 May 2015 17:18:35 +0200
Subject: iio: adis16400: Use != channel indices for the two voltage channels

From: Paul Cercueil <[email protected]>

commit 7323d59862802ca109451eeda9777024a7625509 upstream.

Previously, the two voltage channels had the same ID, which didn't cause conflicts in sysfs only because one channel is named and the other isn't; this is still violating the spec though, two indexed channels should never have the same index.

---
 drivers/iio/imu/adis16400_core.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

@@ -485,10 +485,10 @@ static int adis16400_read_raw(struct iio
 	}
 }
 
-#define ADIS16400_VOLTAGE_CHAN(addr, bits, name, si) { \
+#define ADIS16400_VOLTAGE_CHAN(addr, bits, name, si, chn) { \
 	.type = IIO_VOLTAGE, \
 	.indexed = 1, \
-	.channel = 0, \
+	.channel = chn, \
 	.extend_name = name, \
 	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
 		BIT(IIO_CHAN_INFO_SCALE), \

@@ -504,10 +504,10 @@ static int adis16400_read_raw(struct iio
 }
 
 #define ADIS16400_SUPPLY_CHAN(addr, bits) \
-	ADIS16400_VOLTAGE_CHAN(addr, bits, "supply", ADIS16400_SCAN_SUPPLY)
+	ADIS16400_VOLTAGE_CHAN(addr, bits, "supply", ADIS16400_SCAN_SUPPLY, 0)
 
 #define ADIS16400_AUX_ADC_CHAN(addr, bits) \
-	ADIS16400_VOLTAGE_CHAN(addr, bits, NULL, ADIS16400_SCAN_ADC)
+	ADIS16400_VOLTAGE_CHAN(addr, bits, NULL, ADIS16400_SCAN_ADC, 1)
 
 #define ADIS16400_GYRO_CHAN(mod, addr, bits) { \
 	.type = IIO_ANGL_VEL, \

Patches currently in stable-queue which might be from [email protected] are

queue-3.10/iio-adis16400-compute-the-scan-mask-from-channel-indices.patch queue-3.10/iio-adis16400-use-channel-indices-for-the-two-voltage-channels.patch --
To unsubscribe from this list: send the line "unsubscribe stable" in