2 files changed, 11 insertions, 6 deletions

diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
index 965ee22d3ac8..eb261a58fc68 100644
--- a/drivers/iio/common/st_sensors/st_sensors_core.c
+++ b/drivers/iio/common/st_sensors/st_sensors_core.c
@@ -235,10 +235,13 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev,
         if (err < 0)
                 goto init_error;
 
-        err = st_sensors_set_fullscale(indio_dev,
-                                                sdata->current_fullscale->num);
-        if (err < 0)
-                goto init_error;
+        if (sdata->current_fullscale) {
+                err = st_sensors_set_fullscale(indio_dev,
+                                               sdata->current_fullscale->num);
+                if (err < 0)
+                        goto init_error;
+        } else
+                dev_info(&indio_dev->dev, "Full-scale not possible\n");
 
         err = st_sensors_set_odr(indio_dev, sdata->odr);
         if (err < 0)
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index ceebd3c27892..16cfbc530769 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -226,8 +226,10 @@ int st_press_common_probe(struct iio_dev *indio_dev,
         indio_dev->channels = pdata->sensor->ch;
         indio_dev->num_channels = ARRAY_SIZE(st_press_channels);
 
-        pdata->current_fullscale = (struct st_sensor_fullscale_avl *)
-                                                &pdata->sensor->fs.fs_avl[0];
+        if (pdata->sensor->fs.addr != 0)
+                pdata->current_fullscale = (struct st_sensor_fullscale_avl *)
+                        &pdata->sensor->fs.fs_avl[0];
+
         pdata->odr = pdata->sensor->odr.odr_avl[0].hz;
 
         if (!plat_data)