lkml.org 
[lkml]   [2015]   [Jul]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 039/102] iio: adis16400: Use != channel indices for the two voltage channels
    Date
    3.19.8-ckt3 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Paul Cercueil <paul.cercueil@analog.com>

    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.

    Signed-off-by: Paul Cercueil <paul.cercueil@analog.com>
    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    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, \
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-07-07 21:01    [W:2.586 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site