Skip to content

Commit 7323d59

Browse files
Paul Cercueiljic23
Paul Cercueil
authored andcommitted
iio: adis16400: Use != channel indices for the two voltage channels
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. Signed-off-by: Paul Cercueil <paul.cercueil@analog.com> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Cc: <stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
1 parent 69ca2d7 commit 7323d59

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/iio/imu/adis16400_core.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -459,10 +459,10 @@ static int adis16400_read_raw(struct iio_dev *indio_dev,
459459
}
460460
}
461461

462-
#define ADIS16400_VOLTAGE_CHAN(addr, bits, name, si) { \
462+
#define ADIS16400_VOLTAGE_CHAN(addr, bits, name, si, chn) { \
463463
.type = IIO_VOLTAGE, \
464464
.indexed = 1, \
465-
.channel = 0, \
465+
.channel = chn, \
466466
.extend_name = name, \
467467
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
468468
BIT(IIO_CHAN_INFO_SCALE), \
@@ -479,10 +479,10 @@ static int adis16400_read_raw(struct iio_dev *indio_dev,
479479
}
480480

481481
#define ADIS16400_SUPPLY_CHAN(addr, bits) \
482-
ADIS16400_VOLTAGE_CHAN(addr, bits, "supply", ADIS16400_SCAN_SUPPLY)
482+
ADIS16400_VOLTAGE_CHAN(addr, bits, "supply", ADIS16400_SCAN_SUPPLY, 0)
483483

484484
#define ADIS16400_AUX_ADC_CHAN(addr, bits) \
485-
ADIS16400_VOLTAGE_CHAN(addr, bits, NULL, ADIS16400_SCAN_ADC)
485+
ADIS16400_VOLTAGE_CHAN(addr, bits, NULL, ADIS16400_SCAN_ADC, 1)
486486

487487
#define ADIS16400_GYRO_CHAN(mod, addr, bits) { \
488488
.type = IIO_ANGL_VEL, \

0 commit comments

Comments
 (0)