|
@@ -30,11 +30,6 @@ int st_magn_trig_set_state(struct iio_trigger *trig, bool state)
|
|
return st_sensors_set_dataready_irq(indio_dev, state);
|
|
return st_sensors_set_dataready_irq(indio_dev, state);
|
|
}
|
|
}
|
|
|
|
|
|
-static int st_magn_buffer_preenable(struct iio_dev *indio_dev)
|
|
|
|
-{
|
|
|
|
- return st_sensors_set_enable(indio_dev, true);
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
static int st_magn_buffer_postenable(struct iio_dev *indio_dev)
|
|
static int st_magn_buffer_postenable(struct iio_dev *indio_dev)
|
|
{
|
|
{
|
|
int err;
|
|
int err;
|
|
@@ -50,7 +45,7 @@ static int st_magn_buffer_postenable(struct iio_dev *indio_dev)
|
|
if (err < 0)
|
|
if (err < 0)
|
|
goto st_magn_buffer_postenable_error;
|
|
goto st_magn_buffer_postenable_error;
|
|
|
|
|
|
- return err;
|
|
|
|
|
|
+ return st_sensors_set_enable(indio_dev, true);
|
|
|
|
|
|
st_magn_buffer_postenable_error:
|
|
st_magn_buffer_postenable_error:
|
|
kfree(mdata->buffer_data);
|
|
kfree(mdata->buffer_data);
|
|
@@ -63,11 +58,11 @@ static int st_magn_buffer_predisable(struct iio_dev *indio_dev)
|
|
int err;
|
|
int err;
|
|
struct st_sensor_data *mdata = iio_priv(indio_dev);
|
|
struct st_sensor_data *mdata = iio_priv(indio_dev);
|
|
|
|
|
|
- err = iio_triggered_buffer_predisable(indio_dev);
|
|
|
|
|
|
+ err = st_sensors_set_enable(indio_dev, false);
|
|
if (err < 0)
|
|
if (err < 0)
|
|
goto st_magn_buffer_predisable_error;
|
|
goto st_magn_buffer_predisable_error;
|
|
|
|
|
|
- err = st_sensors_set_enable(indio_dev, false);
|
|
|
|
|
|
+ err = iio_triggered_buffer_predisable(indio_dev);
|
|
|
|
|
|
st_magn_buffer_predisable_error:
|
|
st_magn_buffer_predisable_error:
|
|
kfree(mdata->buffer_data);
|
|
kfree(mdata->buffer_data);
|
|
@@ -75,7 +70,6 @@ st_magn_buffer_predisable_error:
|
|
}
|
|
}
|
|
|
|
|
|
static const struct iio_buffer_setup_ops st_magn_buffer_setup_ops = {
|
|
static const struct iio_buffer_setup_ops st_magn_buffer_setup_ops = {
|
|
- .preenable = &st_magn_buffer_preenable,
|
|
|
|
.postenable = &st_magn_buffer_postenable,
|
|
.postenable = &st_magn_buffer_postenable,
|
|
.predisable = &st_magn_buffer_predisable,
|
|
.predisable = &st_magn_buffer_predisable,
|
|
};
|
|
};
|