4 files changed, 16 insertions, 5 deletions

diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index a7e68c81f89d..a077cc86421b 100644
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -68,13 +68,13 @@
 /* Defaults values */
 #define BMA180_DEF_PMODE        0
 #define BMA180_DEF_BW           20
-#define BMA180_DEF_SCALE        250
+#define BMA180_DEF_SCALE        2452
 
 /* Available values for sysfs */
 #define BMA180_FLP_FREQ_AVAILABLE \
         "10 20 40 75 150 300"
 #define BMA180_SCALE_AVAILABLE \
-        "0.000130 0.000190 0.000250 0.000380 0.000500 0.000990 0.001980"
+        "0.001275 0.001863 0.002452 0.003727 0.004903 0.009709 0.019417"
 
 struct bma180_data {
         struct i2c_client *client;
@@ -94,7 +94,7 @@ enum bma180_axis {
 };
 
 static int bw_table[] = { 10, 20, 40, 75, 150, 300 }; /* Hz */
-static int scale_table[] = { 130, 190, 250, 380, 500, 990, 1980 };
+static int scale_table[] = { 1275, 1863, 2452, 3727, 4903, 9709, 19417 };
 
 static int bma180_get_acc_reg(struct bma180_data *data, enum bma180_axis axis)
 {
@@ -376,6 +376,8 @@ static int bma180_write_raw(struct iio_dev *indio_dev,
                 mutex_unlock(&data->mutex);
                 return ret;
         case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:
+                if (val2)
+                        return -EINVAL;
                 mutex_lock(&data->mutex);
                 ret = bma180_set_bw(data, val);
                 mutex_unlock(&data->mutex);
diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
index 9231f8a65e79..3c12d4966376 100644
--- a/drivers/iio/accel/mma8452.c
+++ b/drivers/iio/accel/mma8452.c
@@ -111,8 +111,14 @@ static const int mma8452_samp_freq[8][2] = {
         {6, 250000}, {1, 560000}
 };
 
+/* 
+ * Hardware has fullscale of -2G, -4G, -8G corresponding to raw value -2048
+ * The userspace interface uses m/s^2 and we declare micro units
+ * So scale factor is given by:
+ *      g * N * 1000000 / 2048 for N = 2, 4, 8 and g=9.80665
+ */
 static const int mma8452_scales[3][2] = {
-        {0, 977}, {0, 1953}, {0, 3906}
+        {0, 9577}, {0, 19154}, {0, 38307}
 };
 
 static ssize_t mma8452_show_samp_freq_avail(struct device *dev,
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index 2952ee038477..0472ee268271 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -963,7 +963,7 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev,
 
         /* Now we have the two masks, work from least sig and build up sizes */
         for_each_set_bit(out_ind,
-                         indio_dev->active_scan_mask,
+                         buffer->scan_mask,
                          indio_dev->masklength) {
                 in_ind = find_next_bit(indio_dev->active_scan_mask,
                                        indio_dev->masklength,
diff --git a/drivers/iio/industrialio-event.c b/drivers/iio/industrialio-event.c
index 35a5b0311dae..0c1e37e3120a 100644
--- a/drivers/iio/industrialio-event.c
+++ b/drivers/iio/industrialio-event.c
@@ -346,6 +346,9 @@ static int iio_device_add_event(struct iio_dev *indio_dev,
                         &indio_dev->event_interface->dev_attr_list);
                 kfree(postfix);
 
+                if ((ret == -EBUSY) && (shared_by != IIO_SEPARATE))
+                        continue;
+
                 if (ret)
                         return ret;