Merge remote-tracking branch 'staging/staging-next'

[karo-tx-linux.git] / drivers / iio / magnetometer / st_magn_buffer.c

diff --git a/drivers/iio/magnetometer/st_magn_buffer.c b/drivers/iio/magnetometer/st_magn_buffer.c
index 708857bdb47d3d4ba69a0fc65d1512defe4881c9..bf427dc0d226c40de9adc92257ece78ab6b14de6 100644 (file)
--- a/drivers/iio/magnetometer/st_magn_buffer.c
+++ b/drivers/iio/magnetometer/st_magn_buffer.c
@@ -25,16 +25,7 @@
 
 static int st_magn_buffer_preenable(struct iio_dev *indio_dev)
 {
-       int err;
-
-       err = st_sensors_set_enable(indio_dev, true);
-       if (err < 0)
-               goto st_magn_set_enable_error;
-
-       err = iio_sw_buffer_preenable(indio_dev);
-
-st_magn_set_enable_error:
-       return err;
+       return st_sensors_set_enable(indio_dev, true);
 }
 
 static int st_magn_buffer_postenable(struct iio_dev *indio_dev)