On Mon, 17 Jul 2017 12:50:55 -0700
Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx> wrote:
> On Sat, 2017-07-15 at 12:39 +0100, Jonathan Cameron wrote:
> > On Thu, 13 Jul 2017 15:13:41 +0200
> > Hans de Goede <hdegoede@xxxxxxxxxx> wrote:
> >
> > >
> > > 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: Hans de Goede <hdegoede@xxxxxxxxxx>
> Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx>
This bit of code goes back a long way. I've taken the view
that it should be relevant as long as it applies (so back to
the i2c / spi split) Hence I've not added a fixes tag but
just marked it for stable.
Applied to the fixes-togreg branch of iio.git.
Thanks,
Jonathan
>
> > Looks right to me, but I'd like to send this for stable so would
> > like a second opinion, say from Srinivas as the original author.
> > Other comments obviously welcome as well!
> > >
> > > ---
> > > drivers/iio/accel/bmc150-accel-core.c | 9 +--------
> > > 1 file changed, 1 insertion(+), 8 deletions(-)
> > >
> > > diff --git a/drivers/iio/accel/bmc150-accel-core.c
> > > b/drivers/iio/accel/bmc150-accel-core.c
> > > index 6b5d3be283c4..807299dd45eb 100644
> > > --- a/drivers/iio/accel/bmc150-accel-core.c
> > > +++ b/drivers/iio/accel/bmc150-accel-core.c
> > > @@ -193,7 +193,6 @@ struct bmc150_accel_data {
> > > struct regmap *regmap;
> > > int irq;
> > > struct bmc150_accel_interrupt
> > > interrupts[BMC150_ACCEL_INTERRUPTS];
> > > - atomic_t active_intr;
> > > struct bmc150_accel_trigger
> > > triggers[BMC150_ACCEL_TRIGGERS];
> > > struct mutex mutex;
> > > u8 fifo_mode, watermark;
> > > @@ -493,11 +492,6 @@ static int bmc150_accel_set_interrupt(struct
> > > bmc150_accel_data *data, int i,
> > > goto out_fix_power_state;
> > > }
> > >
> > > - if (state)
> > > - atomic_inc(&data->active_intr);
> > > - else
> > > - atomic_dec(&data->active_intr);
> > > -
> > > return 0;
> > >
> > > out_fix_power_state:
> > > @@ -1710,8 +1704,7 @@ static int bmc150_accel_resume(struct device
> > > *dev)
> > > struct bmc150_accel_data *data = iio_priv(indio_dev);
> > >
> > > 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);
> > > 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
