7 files changed, 15 insertions, 10 deletions

diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c
index c73331f7782b..2072a31e813b 100644
--- a/drivers/iio/accel/bmc150-accel-core.c
+++ b/drivers/iio/accel/bmc150-accel-core.c
@@ -547,7 +547,7 @@ static int bmc150_accel_get_axis(struct bmc150_accel_data *data,
 {
         int ret;
         int axis = chan->scan_index;
-        unsigned int raw_val;
+        __le16 raw_val;
 
         mutex_lock(&data->mutex);
         ret = bmc150_accel_set_power_state(data, true);
@@ -557,14 +557,14 @@ static int bmc150_accel_get_axis(struct bmc150_accel_data *data,
         }
 
         ret = regmap_bulk_read(data->regmap, BMC150_ACCEL_AXIS_TO_REG(axis),
-                               &raw_val, 2);
+                               &raw_val, sizeof(raw_val));
         if (ret < 0) {
                 dev_err(data->dev, "Error reading axis %d\n", axis);
                 bmc150_accel_set_power_state(data, false);
                 mutex_unlock(&data->mutex);
                 return ret;
         }
-        *val = sign_extend32(raw_val >> chan->scan_type.shift,
+        *val = sign_extend32(le16_to_cpu(raw_val) >> chan->scan_type.shift,
                              chan->scan_type.realbits - 1);
         ret = bmc150_accel_set_power_state(data, false);
         mutex_unlock(&data->mutex);
@@ -988,6 +988,7 @@ static const struct iio_event_spec bmc150_accel_event = {
                 .realbits = (bits),                                     \
                 .storagebits = 16,                                      \
                 .shift = 16 - (bits),                                   \
+                .endianness = IIO_LE,                                   \
         },                                                              \
         .event_spec = &bmc150_accel_event,                              \
         .num_event_specs = 1                                            \
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index af4aea7b20f9..82c718c515a0 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -134,6 +134,7 @@ config AT91_ADC
 config AT91_SAMA5D2_ADC
         tristate "Atmel AT91 SAMA5D2 ADC"
         depends on ARCH_AT91 || COMPILE_TEST
+        depends on HAS_IOMEM
         help
           Say yes here to build support for Atmel SAMA5D2 ADC which is
           available on SAMA5D2 SoC family.
diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c
index bbce3b09ac45..4dac567e75b4 100644
--- a/drivers/iio/gyro/bmg160_core.c
+++ b/drivers/iio/gyro/bmg160_core.c
@@ -452,7 +452,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val)
 static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val)
 {
         int ret;
-        unsigned int raw_val;
+        __le16 raw_val;
 
         mutex_lock(&data->mutex);
         ret = bmg160_set_power_state(data, true);
@@ -462,7 +462,7 @@ static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val)
         }
 
         ret = regmap_bulk_read(data->regmap, BMG160_AXIS_TO_REG(axis), &raw_val,
-                               2);
+                               sizeof(raw_val));
         if (ret < 0) {
                 dev_err(data->dev, "Error reading axis %d\n", axis);
                 bmg160_set_power_state(data, false);
@@ -470,7 +470,7 @@ static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val)
                 return ret;
         }
 
-        *val = sign_extend32(raw_val, 15);
+        *val = sign_extend32(le16_to_cpu(raw_val), 15);
         ret = bmg160_set_power_state(data, false);
         mutex_unlock(&data->mutex);
         if (ret < 0)
@@ -733,6 +733,7 @@ static const struct iio_event_spec bmg160_event = {
                 .sign = 's',                                            \
                 .realbits = 16,                                 \
                 .storagebits = 16,                                      \
+                .endianness = IIO_LE,                                   \
         },                                                              \
         .event_spec = &bmg160_event,                                    \
         .num_event_specs = 1                                            \
@@ -780,7 +781,7 @@ static irqreturn_t bmg160_trigger_handler(int irq, void *p)
                         mutex_unlock(&data->mutex);
                         goto err;
                 }
-                data->buffer[i++] = ret;
+                data->buffer[i++] = val;
         }
         mutex_unlock(&data->mutex);
 
diff --git a/drivers/iio/health/max30100.c b/drivers/iio/health/max30100.c
index 09db89359544..90ab8a2d2846 100644
--- a/drivers/iio/health/max30100.c
+++ b/drivers/iio/health/max30100.c
@@ -238,12 +238,13 @@ static irqreturn_t max30100_interrupt_handler(int irq, void *private)
 
         mutex_lock(&data->lock);
 
-        while (cnt-- || (cnt = max30100_fifo_count(data) > 0)) {
+        while (cnt || (cnt = max30100_fifo_count(data) > 0)) {
                 ret = max30100_read_measurement(data);
                 if (ret)
                         break;
 
                 iio_push_to_buffers(data->indio_dev, data->buffer);
+                cnt--;
         }
 
         mutex_unlock(&data->lock);
diff --git a/drivers/iio/imu/inv_mpu6050/Kconfig b/drivers/iio/imu/inv_mpu6050/Kconfig
index a7f557af4389..847455a2d6bb 100644
--- a/drivers/iio/imu/inv_mpu6050/Kconfig
+++ b/drivers/iio/imu/inv_mpu6050/Kconfig
@@ -9,9 +9,8 @@ config INV_MPU6050_IIO
 
 config INV_MPU6050_I2C
         tristate "Invensense MPU6050 devices (I2C)"
-        depends on I2C
+        depends on I2C_MUX
         select INV_MPU6050_IIO
-        select I2C_MUX
         select REGMAP_I2C
         help
           This driver supports the Invensense MPU6050 devices.
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index b976332d45d3..90462fcf5436 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -653,6 +653,7 @@ static int iio_verify_update(struct iio_dev *indio_dev,
         unsigned int modes;
 
         memset(config, 0, sizeof(*config));
+        config->watermark = ~0;
 
         /*
          * If there is just one buffer and we are removing it there is nothing
diff --git a/drivers/iio/magnetometer/st_magn.h b/drivers/iio/magnetometer/st_magn.h
index 06a4d9c35581..9daca4681922 100644
--- a/drivers/iio/magnetometer/st_magn.h
+++ b/drivers/iio/magnetometer/st_magn.h
@@ -44,6 +44,7 @@ static inline int st_magn_allocate_ring(struct iio_dev *indio_dev)
 static inline void st_magn_deallocate_ring(struct iio_dev *indio_dev)
 {
 }
+#define ST_MAGN_TRIGGER_SET_STATE NULL
 #endif /* CONFIG_IIO_BUFFER */
 
 #endif /* ST_MAGN_H */