Merge tag 'char-misc-6.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sfrench/cifs-2.6.git] / drivers / iio / health / afe4404.c

diff --git a/drivers/iio/health/afe4404.c b/drivers/iio/health/afe4404.c
index 8fca787b25245ff6712fcebad517cce2356b4bbd..836da31b7e30cb67eeee3daf748aa656c5e37745 100644 (file)
--- a/drivers/iio/health/afe4404.c
+++ b/drivers/iio/health/afe4404.c
@@ -250,20 +250,20 @@ static int afe4404_read_raw(struct iio_dev *indio_dev,
                            int *val, int *val2, long mask)
 {
        struct afe4404_data *afe = iio_priv(indio_dev);
-       unsigned int value_reg = afe4404_channel_values[chan->address];
-       unsigned int led_field = afe4404_channel_leds[chan->address];
-       unsigned int offdac_field = afe4404_channel_offdacs[chan->address];
+       unsigned int value_reg, led_field, offdac_field;
        int ret;
 
        switch (chan->type) {
        case IIO_INTENSITY:
                switch (mask) {
                case IIO_CHAN_INFO_RAW:
+                       value_reg = afe4404_channel_values[chan->address];
                        ret = regmap_read(afe->regmap, value_reg, val);
                        if (ret)
                                return ret;
                        return IIO_VAL_INT;
                case IIO_CHAN_INFO_OFFSET:
+                       offdac_field = afe4404_channel_offdacs[chan->address];
                        ret = regmap_field_read(afe->fields[offdac_field], val);
                        if (ret)
                                return ret;
@@ -273,6 +273,7 @@ static int afe4404_read_raw(struct iio_dev *indio_dev,
        case IIO_CURRENT:
                switch (mask) {
                case IIO_CHAN_INFO_RAW:
+                       led_field = afe4404_channel_leds[chan->address];
                        ret = regmap_field_read(afe->fields[led_field], val);
                        if (ret)
                                return ret;
@@ -295,19 +296,20 @@ static int afe4404_write_raw(struct iio_dev *indio_dev,
                             int val, int val2, long mask)
 {
        struct afe4404_data *afe = iio_priv(indio_dev);
-       unsigned int led_field = afe4404_channel_leds[chan->address];
-       unsigned int offdac_field = afe4404_channel_offdacs[chan->address];
+       unsigned int led_field, offdac_field;
 
        switch (chan->type) {
        case IIO_INTENSITY:
                switch (mask) {
                case IIO_CHAN_INFO_OFFSET:
+                       offdac_field = afe4404_channel_offdacs[chan->address];
                        return regmap_field_write(afe->fields[offdac_field], val);
                }
                break;
        case IIO_CURRENT:
                switch (mask) {
                case IIO_CHAN_INFO_RAW:
+                       led_field = afe4404_channel_leds[chan->address];
                        return regmap_field_write(afe->fields[led_field], val);
                }
                break;