iio:magn: 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/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index 729c71af940034acb9cd8712327a4df93542caab..82461eff995a93d534dfa0779d73724e1e1191a9 100644 (file)
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -373,10 +373,11 @@ int st_magn_common_probe(struct iio_dev *indio_dev,
        if (err < 0)
                return err;
 
+       err = st_magn_allocate_ring(indio_dev);
+       if (err < 0)
+               return err;
+
        if (irq > 0) {
-               err = st_magn_allocate_ring(indio_dev);
-               if (err < 0)
-                       return err;
                err = st_sensors_allocate_trigger(indio_dev, NULL);
                if (err < 0)
                        goto st_magn_probe_trigger_error;
@@ -392,8 +393,7 @@ st_magn_device_register_error:
        if (irq > 0)
                st_sensors_deallocate_trigger(indio_dev);
 st_magn_probe_trigger_error:
-       if (irq > 0)
-               st_magn_deallocate_ring(indio_dev);
+       st_magn_deallocate_ring(indio_dev);
 
        return err;
 }
@@ -404,10 +404,10 @@ void st_magn_common_remove(struct iio_dev *indio_dev)
        struct st_sensor_data *mdata = iio_priv(indio_dev);
 
        iio_device_unregister(indio_dev);
-       if (mdata->get_irq_data_ready(indio_dev) > 0) {
+       if (mdata->get_irq_data_ready(indio_dev) > 0)
                st_sensors_deallocate_trigger(indio_dev);
-               st_magn_deallocate_ring(indio_dev);
-       }
+
+       st_magn_deallocate_ring(indio_dev);
 }
 EXPORT_SYMBOL(st_magn_common_remove);