Commit 1ca38692 authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman

iio: accel: bmc150: Always restore device to normal mode after suspend-resume

commit e59e1898 upstream.

After probe we would put the device in normal mode, after a runtime
suspend-resume we would put it back in normal mode. But for a regular
suspend-resume we would only put it back in normal mode if triggers
or events have been requested.  This is not consistent and breaks
reading raw values after a suspend-resume.

This commit changes the regular resume path to also unconditionally put
the device back in normal mode, fixing reading of raw values not working
after a regular suspend-resume cycle.
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c5347390
...@@ -193,7 +193,6 @@ struct bmc150_accel_data { ...@@ -193,7 +193,6 @@ struct bmc150_accel_data {
struct regmap *regmap; struct regmap *regmap;
int irq; int irq;
struct bmc150_accel_interrupt interrupts[BMC150_ACCEL_INTERRUPTS]; struct bmc150_accel_interrupt interrupts[BMC150_ACCEL_INTERRUPTS];
atomic_t active_intr;
struct bmc150_accel_trigger triggers[BMC150_ACCEL_TRIGGERS]; struct bmc150_accel_trigger triggers[BMC150_ACCEL_TRIGGERS];
struct mutex mutex; struct mutex mutex;
u8 fifo_mode, watermark; u8 fifo_mode, watermark;
...@@ -493,11 +492,6 @@ static int bmc150_accel_set_interrupt(struct bmc150_accel_data *data, int i, ...@@ -493,11 +492,6 @@ static int bmc150_accel_set_interrupt(struct bmc150_accel_data *data, int i,
goto out_fix_power_state; goto out_fix_power_state;
} }
if (state)
atomic_inc(&data->active_intr);
else
atomic_dec(&data->active_intr);
return 0; return 0;
out_fix_power_state: out_fix_power_state:
...@@ -1709,8 +1703,7 @@ static int bmc150_accel_resume(struct device *dev) ...@@ -1709,8 +1703,7 @@ static int bmc150_accel_resume(struct device *dev)
struct bmc150_accel_data *data = iio_priv(indio_dev); struct bmc150_accel_data *data = iio_priv(indio_dev);
mutex_lock(&data->mutex); mutex_lock(&data->mutex);
if (atomic_read(&data->active_intr)) bmc150_accel_set_mode(data, BMC150_ACCEL_SLEEP_MODE_NORMAL, 0);
bmc150_accel_set_mode(data, BMC150_ACCEL_SLEEP_MODE_NORMAL, 0);
bmc150_accel_fifo_set_mode(data); bmc150_accel_fifo_set_mode(data);
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment