Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7323d598 authored by Paul Cercueil's avatar Paul Cercueil Committed by Jonathan Cameron
Browse files

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: default avatarPaul Cercueil <paul.cercueil@analog.com>
Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 69ca2d77

drivers/iio/imu/adis16400_core.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -459,10 +459,10 @@ static int adis16400_read_raw(struct iio_dev *indio_dev, 
	}

	}

}

}





#define ADIS16400_VOLTAGE_CHAN(addr, bits, name, si) { \

#define ADIS16400_VOLTAGE_CHAN(addr, bits, name, si, chn) { \

	.type = IIO_VOLTAGE, \

	.type = IIO_VOLTAGE, \

	.indexed = 1, \

	.indexed = 1, \

	.channel = 0, \

	.channel = chn, \

	.extend_name = name, \

	.extend_name = name, \

	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \

	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \

		BIT(IIO_CHAN_INFO_SCALE), \

		BIT(IIO_CHAN_INFO_SCALE), \
@@ -479,10 +479,10 @@ static int adis16400_read_raw(struct iio_dev *indio_dev, 
}

}





#define ADIS16400_SUPPLY_CHAN(addr, bits) \

#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) \

#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) { \

#define ADIS16400_GYRO_CHAN(mod, addr, bits) { \

	.type = IIO_ANGL_VEL, \

	.type = IIO_ANGL_VEL, \