On Sat, 2015-01-31 at 02:00 +0200, Octavian Purdila wrote: > Previous of this patch the check was only done if we enabled the event > and it was already enabled. We can do the same if the event is > disabled and we want to disable it. > > The patch also adds the same check on the trigger code. > > Signed-off-by: Octavian Purdila <octavian.purdila@xxxxxxxxx> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx> > --- > drivers/iio/accel/bmc150-accel.c | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/drivers/iio/accel/bmc150-accel.c b/drivers/iio/accel/bmc150-accel.c > index 0873925..f040f40 100644 > --- a/drivers/iio/accel/bmc150-accel.c > +++ b/drivers/iio/accel/bmc150-accel.c > @@ -748,7 +748,7 @@ static int bmc150_accel_write_event_config(struct iio_dev *indio_dev, > struct bmc150_accel_data *data = iio_priv(indio_dev); > int ret; > > - if (state && data->ev_enable_state) > + if (state == data->ev_enable_state) > return 0; > > mutex_lock(&data->mutex); > @@ -984,6 +984,18 @@ static int bmc150_accel_data_rdy_trigger_set_state(struct iio_trigger *trig, > > mutex_lock(&data->mutex); > > + if (data->motion_trig == trig) { > + if (data->motion_trigger_on == state) { > + mutex_unlock(&data->mutex); > + return 0; > + } > + } else { > + if (data->dready_trigger_on == state) { > + mutex_unlock(&data->mutex); > + return 0; > + } > + } > + > if (!state && data->ev_enable_state && data->motion_trigger_on) { > data->motion_trigger_on = false; > mutex_unlock(&data->mutex); -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html