kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

iio: bmc150: exit early if event / trigger state is not changed

Browse source 
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@intel.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Octavian Purdila 2015-01-31 02:00:05 +02:00 committed by Jonathan Cameron
parent 8e22f477e1
commit 14ee64f438
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/iio/accel/bmc150-accel.c
View file

@ -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); struct bmc150_accel_data *data = iio_priv(indio_dev);
int ret; int ret;
if (state && data->ev_enable_state) if (state == data->ev_enable_state)
return 0; return 0;
mutex_lock(&data->mutex); 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); 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) { if (!state && data->ev_enable_state && data->motion_trigger_on) {
data->motion_trigger_on = false; data->motion_trigger_on = false;
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);