openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

iio: pressure: zpa2326: fix iio_triggered_buffer_postenable position 

The iio_triggered_buffer_{predisable,postenable} functions attach/detach
the poll functions.

The iio_triggered_buffer_postenable() should be called before (to attach
the poll func) and then the

The iio_triggered_buffer_predisable() function is hooked directly without
anything, which is probably fine, as the postenable() version seems to also
do some reset/wake-up of the device.
This will mean it will be easier when removing it; i.e. it just gets
removed.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Alexandru Ardelean 2019-09-20 11:03:48 +03:00 committed by Jonathan Cameron
parent 97d62c345a
commit fe2392c67d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/iio/pressure/zpa2326.c
View File

@ -1243,6 +1243,11 @@ static int zpa2326_postenable_buffer(struct iio_dev *indio_dev)
const struct zpa2326_private *priv = iio_priv(indio_dev); const struct zpa2326_private *priv = iio_priv(indio_dev);
int err; int err;
/* Plug our own trigger event handler. */
err = iio_triggered_buffer_postenable(indio_dev);
if (err)
goto err;
if (!priv->waken) { if (!priv->waken) {
/* /*
* We were already power supplied. Just clear hardware FIFO to * We were already power supplied. Just clear hardware FIFO to
@ -1250,7 +1255,7 @@ static int zpa2326_postenable_buffer(struct iio_dev *indio_dev)
*/ */
err = zpa2326_clear_fifo(indio_dev, 0); err = zpa2326_clear_fifo(indio_dev, 0);
if (err) if (err)
goto err; goto err_buffer_predisable;
} }
if (!iio_trigger_using_own(indio_dev) && priv->waken) { if (!iio_trigger_using_own(indio_dev) && priv->waken) {
@ -1260,16 +1265,13 @@ static int zpa2326_postenable_buffer(struct iio_dev *indio_dev)
*/ */
err = zpa2326_config_oneshot(indio_dev, priv->irq); err = zpa2326_config_oneshot(indio_dev, priv->irq);
if (err) if (err)
goto err; goto err_buffer_predisable;
} }
/* Plug our own trigger event handler. */
err = iio_triggered_buffer_postenable(indio_dev);
if (err)
goto err;
return 0; return 0;
err_buffer_predisable:
iio_triggered_buffer_predisable(indio_dev);
err: err:
zpa2326_err(indio_dev, "failed to enable buffering (%d)", err); zpa2326_err(indio_dev, "failed to enable buffering (%d)", err);