Hello,

> Correctly initialize device channels, otherwise writing the calibration
> values to sysfs nodes does not work

I think the fix should rather be

        if (chan->channel2 == IIO_MOD_LIGHT_BOTH)
                chip->calib0 = calib_from_sysfs(val);
        else if (chan->channel2 == IIO_MOD_LIGHT_IR)
                chip->calib1 = calib_from_sysfs(val);
        else
                return -EINVAL;

since only the INTENSITY channels have a CALIBSCALE info

the light channel incorrectly sets .indexed = 1 and .channel = 0 which 
should be unnecessary since there is only one IIO_LIGHT channel

regards, p.

> ---
>  drivers/iio/light/tsl2563.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c
> index 5e5d9de..a663ea2 100644
> --- a/drivers/iio/light/tsl2563.c
> +++ b/drivers/iio/light/tsl2563.c
> @@ -460,7 +460,7 @@ static int tsl2563_write_raw(struct iio_dev *indio_dev,
>  {
>       struct tsl2563_chip *chip = iio_priv(indio_dev);
>  
> -     if (chan->channel == IIO_MOD_LIGHT_BOTH)
> +     if (chan->channel == 0)
>               chip->calib0 = calib_from_sysfs(val);
>       else
>               chip->calib1 = calib_from_sysfs(val);
> @@ -543,11 +543,12 @@ static const struct iio_event_spec tsl2563_events[] = {
>  static const struct iio_chan_spec tsl2563_channels[] = {
>       {
>               .type = IIO_LIGHT,
> +             .channel = 0,
>               .indexed = 1,
>               .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),
> -             .channel = 0,
>       }, {
>               .type = IIO_INTENSITY,
> +             .channel = 0,
>               .modified = 1,
>               .channel2 = IIO_MOD_LIGHT_BOTH,
>               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
> @@ -556,6 +557,7 @@ static const struct iio_chan_spec tsl2563_channels[] = {
>               .num_event_specs = ARRAY_SIZE(tsl2563_events),
>       }, {
>               .type = IIO_INTENSITY,
> +             .channel = 1,
>               .modified = 1,
>               .channel2 = IIO_MOD_LIGHT_IR,
>               .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
> 

-- 

Peter Meerwald
+43-664-2444418 (mobile)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to