iio: pressure: zpa2326: fix iio_triggered_buffer_postenable position (fe2392c6) · Commits · 戴 / test

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>

drivers/iio/pressure/zpa2326.c

+9 −7

Original line number	Diff line number	Diff line
		@@ -1243,6 +1243,11 @@ static int zpa2326_postenable_buffer(struct iio_dev *indio_dev)
		const struct zpa2326_private *priv = iio_priv(indio_dev);
		int err;

		/* Plug our own trigger event handler. */
		err = iio_triggered_buffer_postenable(indio_dev);
		if (err)
		goto err;

		if (!priv->waken) {
		/*
		* 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);
		if (err)
		goto err;
		goto err_buffer_predisable;
		}

		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);
		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;

		err_buffer_predisable:
		iio_triggered_buffer_predisable(indio_dev);
		err:
		zpa2326_err(indio_dev, "failed to enable buffering (%d)", err);

Admin message