6 files changed, 15 insertions, 11 deletions

diff --git a/drivers/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c
index 923f56598d4b..3a9f106787d2 100644
--- a/drivers/iio/accel/kxsd9.c
+++ b/drivers/iio/accel/kxsd9.c
@@ -81,7 +81,7 @@ static int kxsd9_write_scale(struct iio_dev *indio_dev, int micro)
 
         mutex_lock(&st->buf_lock);
         ret = spi_w8r8(st->us, KXSD9_READ(KXSD9_REG_CTRL_C));
-        if (ret)
+        if (ret < 0)
                 goto error_ret;
         st->tx[0] = KXSD9_WRITE(KXSD9_REG_CTRL_C);
         st->tx[1] = (ret & ~KXSD9_FS_MASK) | i;
@@ -163,7 +163,7 @@ static int kxsd9_read_raw(struct iio_dev *indio_dev,
                 break;
         case IIO_CHAN_INFO_SCALE:
                 ret = spi_w8r8(st->us, KXSD9_READ(KXSD9_REG_CTRL_C));
-                if (ret)
+                if (ret < 0)
                         goto error_ret;
                 *val2 = kxsd9_micro_scales[ret & KXSD9_FS_MASK];
                 ret = IIO_VAL_INT_PLUS_MICRO;
diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c
index 21e19b60e2b9..2123f0ac2e2a 100644
--- a/drivers/iio/adc/ad7266.c
+++ b/drivers/iio/adc/ad7266.c
@@ -396,8 +396,8 @@ static int ad7266_probe(struct spi_device *spi)
 
         st = iio_priv(indio_dev);
 
-        st->reg = devm_regulator_get(&spi->dev, "vref");
-        if (!IS_ERR_OR_NULL(st->reg)) {
+        st->reg = devm_regulator_get_optional(&spi->dev, "vref");
+        if (!IS_ERR(st->reg)) {
                 ret = regulator_enable(st->reg);
                 if (ret)
                         return ret;
@@ -408,6 +408,9 @@ static int ad7266_probe(struct spi_device *spi)
 
                 st->vref_mv = ret / 1000;
         } else {
+                /* Any other error indicates that the regulator does exist */
+                if (PTR_ERR(st->reg) != -ENODEV)
+                        return PTR_ERR(st->reg);
                 /* Use internal reference */
                 st->vref_mv = 2500;
         }
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c
index f62b8bd9ad7e..dd6fc6d21f9d 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c
@@ -56,6 +56,7 @@ static int asus_acpi_get_sensor_info(struct acpi_device *adev,
         int i;
         acpi_status status;
         union acpi_object *cpm;
+        int ret;
 
         status = acpi_evaluate_object(adev->handle, "CNF0", NULL, &buffer);
         if (ACPI_FAILURE(status))
@@ -82,10 +83,10 @@ static int asus_acpi_get_sensor_info(struct acpi_device *adev,
                         }
                 }
         }
-
+        ret = cpm->package.count;
         kfree(buffer.pointer);
 
-        return cpm->package.count;
+        return ret;
 }
 
 static int acpi_i2c_check_resource(struct acpi_resource *ares, void *data)
diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index a8f533af9eca..ec12181822e6 100644
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ b/drivers/staging/iio/accel/sca3000_core.c
@@ -594,7 +594,7 @@ static ssize_t sca3000_read_frequency(struct device *dev,
                 goto error_ret_mut;
         ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL);
         mutex_unlock(&st->lock);
-        if (ret)
+        if (ret < 0)
                 goto error_ret;
         val = ret;
         if (base_freq > 0)
diff --git a/drivers/staging/iio/adc/ad7606_spi.c b/drivers/staging/iio/adc/ad7606_spi.c
index 825da0769936..9587fa86dc69 100644
--- a/drivers/staging/iio/adc/ad7606_spi.c
+++ b/drivers/staging/iio/adc/ad7606_spi.c
@@ -21,7 +21,7 @@ static int ad7606_spi_read_block(struct device *dev,
 {
         struct spi_device *spi = to_spi_device(dev);
         int i, ret;
-        unsigned short *data;
+        unsigned short *data = buf;
         __be16 *bdata = buf;
 
         ret = spi_read(spi, buf, count * 2);
diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index 9f43976f4ef2..170ac980abcb 100644
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -444,10 +444,10 @@ static ssize_t ad5933_store(struct device *dev,
                 st->settling_cycles = val;
 
                 /* 2x, 4x handling, see datasheet */
-                if (val > 511)
-                        val = (val >> 1) | (1 << 9);
-                else if (val > 1022)
+                if (val > 1022)
                         val = (val >> 2) | (3 << 9);
+                else if (val > 511)
+                        val = (val >> 1) | (1 << 9);
 
                 dat = cpu_to_be16(val);
                 ret = ad5933_i2c_write(st->client,