On Wed, 17 Jun 2020 21:29:07 -0400
Sasha Levin <sashal@xxxxxxxxxx> wrote:
> From: Alexandru Ardelean <alexandru.ardelean@xxxxxxxxxx>
>
> [ Upstream commit 9b7a12c3e090cf3fba6f66f1f23abbc6e0e86021 ]
>
> The iio_triggered_buffer_{predisable,postenable} functions attach/detach
> the poll functions.
>
> For the predisable hook, the disable code should occur before detaching
> the poll func, and for the postenable hook, the poll func should be
> attached before the enable code.
>
> This change reworks the predisable/postenable hooks so that the pollfunc is
> attached/detached in the correct position.
> It also balances the calls a bit, by grouping the preenable and the
> iio_triggered_buffer_postenable() into a single
> isl29125_buffer_postenable() function.
>
This is really part of some rework. It doesn't 'fix' a bug
as such (I think), but rather a bit of logical inconsistency.
Shouldn't do any harm though beyond adding noise to stable.
I added notes to some of these to mark them as not stable material,
but clearly missed this one. Sorry about that.
Jonathan
> Signed-off-by: Alexandru Ardelean <alexandru.ardelean@xxxxxxxxxx>
> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> ---
> drivers/iio/light/isl29125.c | 28 +++++++++++++++++++---------
> 1 file changed, 19 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/iio/light/isl29125.c b/drivers/iio/light/isl29125.c
> index e2945a20e5f6..60388a41ec8c 100644
> --- a/drivers/iio/light/isl29125.c
> +++ b/drivers/iio/light/isl29125.c
> @@ -215,13 +215,24 @@ static const struct iio_info isl29125_info = {
> .driver_module = THIS_MODULE,
> };
>
> -static int isl29125_buffer_preenable(struct iio_dev *indio_dev)
> +static int isl29125_buffer_postenable(struct iio_dev *indio_dev)
> {
> struct isl29125_data *data = iio_priv(indio_dev);
> + int err;
> +
> + err = iio_triggered_buffer_postenable(indio_dev);
> + if (err)
> + return err;
>
> data->conf1 |= ISL29125_MODE_RGB;
> - return i2c_smbus_write_byte_data(data->client, ISL29125_CONF1,
> + err = i2c_smbus_write_byte_data(data->client, ISL29125_CONF1,
> data->conf1);
> + if (err) {
> + iio_triggered_buffer_predisable(indio_dev);
> + return err;
> + }
> +
> + return 0;
> }
>
> static int isl29125_buffer_predisable(struct iio_dev *indio_dev)
> @@ -229,19 +240,18 @@ static int isl29125_buffer_predisable(struct iio_dev *indio_dev)
> struct isl29125_data *data = iio_priv(indio_dev);
> int ret;
>
> - ret = iio_triggered_buffer_predisable(indio_dev);
> - if (ret < 0)
> - return ret;
> -
> data->conf1 &= ~ISL29125_MODE_MASK;
> data->conf1 |= ISL29125_MODE_PD;
> - return i2c_smbus_write_byte_data(data->client, ISL29125_CONF1,
> + ret = i2c_smbus_write_byte_data(data->client, ISL29125_CONF1,
> data->conf1);
> +
> + iio_triggered_buffer_predisable(indio_dev);
> +
> + return ret;
> }
>
> static const struct iio_buffer_setup_ops isl29125_buffer_setup_ops = {
> - .preenable = isl29125_buffer_preenable,
> - .postenable = &iio_triggered_buffer_postenable,
> + .postenable = isl29125_buffer_postenable,
> .predisable = isl29125_buffer_predisable,
> };
>
