On 15/05/15 16:18, Lars-Peter Clausen wrote:
> From: Paul Cercueil <paul.cercueil@xxxxxxxxxx>
>
> 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@xxxxxxxxxx>
> Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Applied to fixes-togreg branch, marked for stable.
> ---
> drivers/iio/imu/adis16400_core.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/imu/adis16400_core.c b/drivers/iio/imu/adis16400_core.c
> index 8de6427..7b63788 100644
> --- a/drivers/iio/imu/adis16400_core.c
> +++ b/drivers/iio/imu/adis16400_core.c
> @@ -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, \
> .indexed = 1, \
> - .channel = 0, \
> + .channel = chn, \
> .extend_name = name, \
> .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
> 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) \
> - 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, \
>
--
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
