Merge tag 'staging-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sfrench/cifs-2.6.git] / drivers / iio / common / st_sensors / st_sensors_core.c

diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
index 26fbd1bd941352d31cb42e0f240f88f20c12fab5..e50c975250e9109ccdfd3fe08b074f504ead86c5 100644 (file)
--- a/drivers/iio/common/st_sensors/st_sensors_core.c
+++ b/drivers/iio/common/st_sensors/st_sensors_core.c
@@ -133,7 +133,7 @@ static int st_sensors_match_fs(struct st_sensor_settings *sensor_settings,
 
        for (i = 0; i < ST_SENSORS_FULLSCALE_AVL_MAX; i++) {
                if (sensor_settings->fs.fs_avl[i].num == 0)
-                       goto st_sensors_match_odr_error;
+                       return ret;
 
                if (sensor_settings->fs.fs_avl[i].num == fs) {
                        *index_fs_avl = i;
@@ -142,7 +142,6 @@ static int st_sensors_match_fs(struct st_sensor_settings *sensor_settings,
                }
        }
 
-st_sensors_match_odr_error:
        return ret;
 }