[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-iio
Subject:    [PATCH] iio: st_accel: fix iio_triggered_buffer_{pre,post}enable positions
From:       Alexandru Ardelean <alexandru.ardelean () analog ! com>
Date:       2019-05-29 13:01:21
Message-ID: 20190529130121.30532-1-alexandru.ardelean () analog ! com
[Download RAW message or body]

The iio_triggered_buffer_{predisable,postenable} functions attach/detach
the poll functions.

For the predisable hook, the disable code should occur before detaching
the poll func, and for the postenable hook, the poll func should be
attached before the enable code.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
---
 drivers/iio/accel/st_accel_buffer.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/iio/accel/st_accel_buffer.c b/drivers/iio/accel/st_accel_buffer.c
index 7fddc137e91e..58cc6305f66e 100644
--- a/drivers/iio/accel/st_accel_buffer.c
+++ b/drivers/iio/accel/st_accel_buffer.c
@@ -40,6 +40,10 @@ static int st_accel_buffer_postenable(struct iio_dev *indio_dev)
 	int err;
 	struct st_sensor_data *adata = iio_priv(indio_dev);
 
+	err = iio_triggered_buffer_postenable(indio_dev);
+	if (err < 0)
+		return err;
+
 	adata->buffer_data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
 	if (adata->buffer_data == NULL) {
 		err = -ENOMEM;
@@ -51,15 +55,12 @@ static int st_accel_buffer_postenable(struct iio_dev *indio_dev)
 	if (err < 0)
 		goto st_accel_buffer_postenable_error;
 
-	err = iio_triggered_buffer_postenable(indio_dev);
-	if (err < 0)
-		goto st_accel_buffer_postenable_error;
-
 	return err;
 
 st_accel_buffer_postenable_error:
 	kfree(adata->buffer_data);
 allocate_memory_error:
+	iio_triggered_buffer_predisable(indio_dev);
 	return err;
 }
 
@@ -68,19 +69,17 @@ static int st_accel_buffer_predisable(struct iio_dev *indio_dev)
 	int err;
 	struct st_sensor_data *adata = iio_priv(indio_dev);
 
-	err = iio_triggered_buffer_predisable(indio_dev);
-	if (err < 0)
-		goto st_accel_buffer_predisable_error;
-
 	err = st_sensors_set_axis_enable(indio_dev, ST_SENSORS_ENABLE_ALL_AXIS);
 	if (err < 0)
 		goto st_accel_buffer_predisable_error;
 
 	err = st_sensors_set_enable(indio_dev, false);
+	if (err < 0)
+		goto st_accel_buffer_predisable_error;
 
 st_accel_buffer_predisable_error:
 	kfree(adata->buffer_data);
-	return err;
+	return iio_triggered_buffer_predisable(indio_dev);
 }
 
 static const struct iio_buffer_setup_ops st_accel_buffer_setup_ops = {
-- 
2.20.1

[prev in list] [next in list] [prev in thread] [next in thread]