1 files changed, 10 insertions, 9 deletions

diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index e8d2849cc81d..729c71af9400 100644
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -348,8 +348,9 @@ static const struct iio_info magn_info = {
 int st_magn_common_probe(struct iio_dev *indio_dev,
                                         struct st_sensors_platform_data *pdata)
 {
-        int err;
         struct st_sensor_data *mdata = iio_priv(indio_dev);
+        int irq = mdata->get_irq_data_ready(indio_dev);
+        int err;
 
         indio_dev->modes = INDIO_DIRECT_MODE;
         indio_dev->info = &magn_info;
@@ -357,7 +358,7 @@ int st_magn_common_probe(struct iio_dev *indio_dev,
         err = st_sensors_check_device_support(indio_dev,
                                 ARRAY_SIZE(st_magn_sensors), st_magn_sensors);
         if (err < 0)
-                goto st_magn_common_probe_error;
+                return err;
 
         mdata->num_data_channels = ST_MAGN_NUMBER_DATA_CHANNELS;
         mdata->multiread_bit = mdata->sensor->multi_read_bit;
@@ -370,12 +371,12 @@ int st_magn_common_probe(struct iio_dev *indio_dev,
 
         err = st_sensors_init_sensor(indio_dev, pdata);
         if (err < 0)
-                goto st_magn_common_probe_error;
+                return err;
 
-        if (mdata->get_irq_data_ready(indio_dev) > 0) {
+        if (irq > 0) {
                 err = st_magn_allocate_ring(indio_dev);
                 if (err < 0)
-                        goto st_magn_common_probe_error;
+                        return err;
                 err = st_sensors_allocate_trigger(indio_dev, NULL);
                 if (err < 0)
                         goto st_magn_probe_trigger_error;
@@ -385,15 +386,15 @@ int st_magn_common_probe(struct iio_dev *indio_dev,
         if (err)
                 goto st_magn_device_register_error;
 
-        return err;
+        return 0;
 
 st_magn_device_register_error:
-        if (mdata->get_irq_data_ready(indio_dev) > 0)
+        if (irq > 0)
                 st_sensors_deallocate_trigger(indio_dev);
 st_magn_probe_trigger_error:
-        if (mdata->get_irq_data_ready(indio_dev) > 0)
+        if (irq > 0)
                 st_magn_deallocate_ring(indio_dev);
-st_magn_common_probe_error:
+
         return err;
 }
 EXPORT_SYMBOL(st_magn_common_probe);