iio:accel: Register buffer also without specific trigger

This patch fix buffer registration that allows to use generic IIO trigger.

Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index 97172ddb8cf9c83d809a3f800a3542d5495f423b..38caedc76b98f20520f9be751fabc15e90b03793 100644 (file)
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -481,11 +481,11 @@ int st_accel_common_probe(struct iio_dev *indio_dev,
        if (err < 0)
                return err;
 
-       if (irq > 0) {
-               err = st_accel_allocate_ring(indio_dev);
-               if (err < 0)
-                       return err;
+       err = st_accel_allocate_ring(indio_dev);
+       if (err < 0)
+               return err;
 
+       if (irq > 0) {
                err = st_sensors_allocate_trigger(indio_dev,
                                                 ST_ACCEL_TRIGGER_OPS);
                if (err < 0)
@@ -502,8 +502,7 @@ st_accel_device_register_error:
        if (irq > 0)
                st_sensors_deallocate_trigger(indio_dev);
 st_accel_probe_trigger_error:
-       if (irq > 0)
-               st_accel_deallocate_ring(indio_dev);
+       st_accel_deallocate_ring(indio_dev);
 
        return err;
 }
@@ -514,10 +513,10 @@ void st_accel_common_remove(struct iio_dev *indio_dev)
        struct st_sensor_data *adata = iio_priv(indio_dev);
 
        iio_device_unregister(indio_dev);
-       if (adata->get_irq_data_ready(indio_dev) > 0) {
+       if (adata->get_irq_data_ready(indio_dev) > 0)
                st_sensors_deallocate_trigger(indio_dev);
-               st_accel_deallocate_ring(indio_dev);
-       }
+
+       st_accel_deallocate_ring(indio_dev);
 }
 EXPORT_SYMBOL(st_accel_common_remove);