3 files changed, 10 insertions, 11 deletions

diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c
index 1bfe5d81792b..8ed75a94f465 100644
--- a/drivers/staging/iio/accel/lis3l02dq_core.c
+++ b/drivers/staging/iio/accel/lis3l02dq_core.c
@@ -257,6 +257,8 @@ static int lis3l02dq_read_raw(struct iio_dev *indio_dev,
                         ret = lis3l02dq_read_reg_s16(indio_dev, reg, val);
                 }
                 mutex_unlock(&indio_dev->mlock);
+                if (ret < 0)
+                        goto error_ret;
                 return IIO_VAL_INT;
         case IIO_CHAN_INFO_SCALE:
                 *val = 0;
diff --git a/drivers/staging/iio/adc/ad7291.c b/drivers/staging/iio/adc/ad7291.c
index 3fc79e582750..a2e61c2fc8d1 100644
--- a/drivers/staging/iio/adc/ad7291.c
+++ b/drivers/staging/iio/adc/ad7291.c
@@ -517,6 +517,7 @@ static const struct iio_info ad7291_info = {
         .read_event_value = &ad7291_read_event_value,
         .write_event_value = &ad7291_write_event_value,
         .event_attrs = &ad7291_event_attribute_group,
+        .driver_module = THIS_MODULE,
 };
 
 static int ad7291_probe(struct i2c_client *client,
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
index d92c97a59d61..9f52a2857929 100644
--- a/drivers/staging/iio/adc/mxs-lradc.c
+++ b/drivers/staging/iio/adc/mxs-lradc.c
@@ -234,7 +234,6 @@ static int mxs_lradc_read_raw(struct iio_dev *iio_dev,
 {
         struct mxs_lradc *lradc = iio_priv(iio_dev);
         int ret;
-        unsigned long mask;
 
         if (m != IIO_CHAN_INFO_RAW)
                 return -EINVAL;
@@ -243,12 +242,6 @@ static int mxs_lradc_read_raw(struct iio_dev *iio_dev,
         if (chan->channel > LRADC_MAX_TOTAL_CHANS)
                 return -EINVAL;
 
-        /* Validate the channel if it doesn't intersect with reserved chans. */
-        bitmap_set(&mask, chan->channel, 1);
-        ret = iio_validate_scan_mask_onehot(iio_dev, &mask);
-        if (ret)
-                return -EINVAL;
-
         /*
          * See if there is no buffered operation in progess. If there is, simply
          * bail out. This can be improved to support both buffered and raw IO at
@@ -661,12 +654,13 @@ static int mxs_lradc_trigger_init(struct iio_dev *iio)
 {
         int ret;
         struct iio_trigger *trig;
+        struct mxs_lradc *lradc = iio_priv(iio);
 
         trig = iio_trigger_alloc("%s-dev%i", iio->name, iio->id);
         if (trig == NULL)
                 return -ENOMEM;
 
-        trig->dev.parent = iio->dev.parent;
+        trig->dev.parent = lradc->dev;
         iio_trigger_set_drvdata(trig, iio);
         trig->ops = &mxs_lradc_trigger_ops;
 
@@ -676,15 +670,17 @@ static int mxs_lradc_trigger_init(struct iio_dev *iio)
                 return ret;
         }
 
-        iio->trig = trig;
+        lradc->trig = trig;
 
         return 0;
 }
 
 static void mxs_lradc_trigger_remove(struct iio_dev *iio)
 {
-        iio_trigger_unregister(iio->trig);
-        iio_trigger_free(iio->trig);
+        struct mxs_lradc *lradc = iio_priv(iio);
+
+        iio_trigger_unregister(lradc->trig);
+        iio_trigger_free(lradc->trig);
 }
 
 static int mxs_lradc_buffer_preenable(struct iio_dev *iio)