iio: hdc100x: fix iio_triggered_buffer_{predisable,postenable} positions

The iio_triggered_buffer_postenable() hook should be called first to
attach the poll function and the iio_triggered_buffer_predisable() hook
should be called last in the predisable hook.

This change updates the driver to attach/detach the poll func in the
correct order.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Reviewed-by: Matt Ranostay <matt.ranostay@konsulko.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/humidity/hdc100x.c b/drivers/iio/humidity/hdc100x.c
index bfe1cdb16846ebb5f32130e105014f2bca3a5cf6..963ff043eecf97b77d7990c84f0bcc70b60915a6 100644 (file)
--- a/drivers/iio/humidity/hdc100x.c
+++ b/drivers/iio/humidity/hdc100x.c
@@ -278,31 +278,34 @@ static int hdc100x_buffer_postenable(struct iio_dev *indio_dev)
        struct hdc100x_data *data = iio_priv(indio_dev);
        int ret;
 
+       ret = iio_triggered_buffer_postenable(indio_dev);
+       if (ret)
+               return ret;
+
        /* Buffer is enabled. First set ACQ Mode, then attach poll func */
        mutex_lock(&data->lock);
        ret = hdc100x_update_config(data, HDC100X_REG_CONFIG_ACQ_MODE,
                                    HDC100X_REG_CONFIG_ACQ_MODE);
        mutex_unlock(&data->lock);
        if (ret)
-               return ret;
+               iio_triggered_buffer_predisable(indio_dev);
 
-       return iio_triggered_buffer_postenable(indio_dev);
+       return ret;
 }
 
 static int hdc100x_buffer_predisable(struct iio_dev *indio_dev)
 {
        struct hdc100x_data *data = iio_priv(indio_dev);
-       int ret;
-
-       /* First detach poll func, then reset ACQ mode. OK to disable buffer */
-       ret = iio_triggered_buffer_predisable(indio_dev);
-       if (ret)
-               return ret;
+       int ret, ret2;
 
        mutex_lock(&data->lock);
        ret = hdc100x_update_config(data, HDC100X_REG_CONFIG_ACQ_MODE, 0);
        mutex_unlock(&data->lock);
 
+       ret2 = iio_triggered_buffer_predisable(indio_dev);
+       if (ret == 0)
+               ret = ret2;
+
        return ret;
 }