]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
iio:magnetometer:mag3110: Fix unreachable code
authorPeter Meerwald <pmeerw@pmeerw.net>
Tue, 25 Feb 2014 19:53:00 +0000 (19:53 +0000)
committerJonathan Cameron <jic23@kernel.org>
Tue, 25 Feb 2014 20:45:58 +0000 (20:45 +0000)
        drivers/iio/magnetometer/mag3110.c:197 mag3110_read_raw()
        info: ignoring unreachable code.

drivers/iio/magnetometer/mag3110.c
   185          case IIO_CHAN_INFO_SCALE:
   186                  switch (chan->type) {
   187                  case IIO_MAGN:
   188                          *val = 0;
   189                          *val2 = 1000;
   190                          return IIO_VAL_INT_PLUS_MICRO;
   191                  case IIO_TEMP:
   192                          *val = 1000;
   193                          return IIO_VAL_INT;
   194                  default:
   195                          return -EINVAL;
   196                  }
   197                  return IIO_VAL_INT_PLUS_MICRO;
                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

introduced by f9279d3a, mag3110: Scale factor missing

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/iio/magnetometer/mag3110.c

index 02e4f976588985240bac522e9f29d24c68688b8a..8b77782474d7a16400b13089a84e6222673d81e1 100644 (file)
@@ -194,7 +194,6 @@ static int mag3110_read_raw(struct iio_dev *indio_dev,
                default:
                        return -EINVAL;
                }
-               return IIO_VAL_INT_PLUS_MICRO;
        case IIO_CHAN_INFO_SAMP_FREQ:
                i = data->ctrl_reg1 >> MAG3110_CTRL_DR_SHIFT;
                *val = mag3110_samp_freq[i][0];