linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Alexandru Ardelean <alexandru.ardelean@analog.com>,
	Denis Ciocca <denis.ciocca@st.com>,
	Jonathan Cameron <Jonathan.Cameron@huawei.com>,
	Sasha Levin <sashal@kernel.org>,
	linux-iio@vger.kernel.org
Subject: [PATCH AUTOSEL 4.4 17/35] iio: st_accel: fix iio_triggered_buffer_{pre,post}enable positions
Date: Fri, 19 Jul 2019 00:14:05 -0400	[thread overview]
Message-ID: <20190719041423.19322-17-sashal@kernel.org> (raw)
In-Reply-To: <20190719041423.19322-1-sashal@kernel.org>

From: Alexandru Ardelean <alexandru.ardelean@analog.com>

[ Upstream commit 05b8bcc96278c9ef927a6f25a98e233e55de42e1 ]

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.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Acked-by: Denis Ciocca <denis.ciocca@st.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/iio/accel/st_accel_buffer.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/drivers/iio/accel/st_accel_buffer.c b/drivers/iio/accel/st_accel_buffer.c
index a1e642ee13d6..4f838277184a 100644
--- a/drivers/iio/accel/st_accel_buffer.c
+++ b/drivers/iio/accel/st_accel_buffer.c
@@ -46,17 +46,19 @@ static int st_accel_buffer_postenable(struct iio_dev *indio_dev)
 		goto allocate_memory_error;
 	}
 
-	err = st_sensors_set_axis_enable(indio_dev,
-					(u8)indio_dev->active_scan_mask[0]);
+	err = iio_triggered_buffer_postenable(indio_dev);
 	if (err < 0)
 		goto st_accel_buffer_postenable_error;
 
-	err = iio_triggered_buffer_postenable(indio_dev);
+	err = st_sensors_set_axis_enable(indio_dev,
+					(u8)indio_dev->active_scan_mask[0]);
 	if (err < 0)
-		goto st_accel_buffer_postenable_error;
+		goto st_sensors_set_axis_enable_error;
 
 	return err;
 
+st_sensors_set_axis_enable_error:
+	iio_triggered_buffer_predisable(indio_dev);
 st_accel_buffer_postenable_error:
 	kfree(adata->buffer_data);
 allocate_memory_error:
@@ -65,20 +67,22 @@ static int st_accel_buffer_postenable(struct iio_dev *indio_dev)
 
 static int st_accel_buffer_predisable(struct iio_dev *indio_dev)
 {
-	int err;
+	int err, err2;
 	struct st_sensor_data *adata = iio_priv(indio_dev);
 
-	err = iio_triggered_buffer_predisable(indio_dev);
-	if (err < 0)
-		goto st_accel_buffer_predisable_error;
-
 	err = st_sensors_set_axis_enable(indio_dev, ST_SENSORS_ENABLE_ALL_AXIS);
 	if (err < 0)
 		goto st_accel_buffer_predisable_error;
 
 	err = st_sensors_set_enable(indio_dev, false);
+	if (err < 0)
+		goto st_accel_buffer_predisable_error;
 
 st_accel_buffer_predisable_error:
+	err2 = iio_triggered_buffer_predisable(indio_dev);
+	if (!err)
+		err = err2;
+
 	kfree(adata->buffer_data);
 	return err;
 }
-- 
2.20.1


  parent reply	other threads:[~2019-07-19  4:15 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-19  4:13 [PATCH AUTOSEL 4.4 01/35] drm/panel: simple: Fix panel_simple_dsi_probe Sasha Levin
2019-07-19  4:13 ` [PATCH AUTOSEL 4.4 02/35] usb: core: hub: Disable hub-initiated U1/U2 Sasha Levin
2019-07-19  4:13 ` [PATCH AUTOSEL 4.4 03/35] tty: max310x: Fix invalid baudrate divisors calculator Sasha Levin
2019-07-19  4:13 ` [PATCH AUTOSEL 4.4 04/35] pinctrl: rockchip: fix leaked of_node references Sasha Levin
2019-07-19  4:13 ` [PATCH AUTOSEL 4.4 05/35] tty: serial: cpm_uart - fix init when SMC is relocated Sasha Levin
2019-07-19  4:13 ` [PATCH AUTOSEL 4.4 06/35] drm/edid: Fix a missing-check bug in drm_load_edid_firmware() Sasha Levin
2019-07-19  4:13 ` [PATCH AUTOSEL 4.4 07/35] memstick: Fix error cleanup path of memstick_init Sasha Levin
2019-07-19  4:13 ` [PATCH AUTOSEL 4.4 08/35] tty/serial: digicolor: Fix digicolor-usart already registered warning Sasha Levin
2019-07-19  4:13 ` [PATCH AUTOSEL 4.4 09/35] tty: serial: msm_serial: avoid system lockup condition Sasha Levin
2019-07-19  4:13 ` [PATCH AUTOSEL 4.4 10/35] drm/virtio: Add memory barriers for capset cache Sasha Levin
2019-07-19  4:13 ` [PATCH AUTOSEL 4.4 11/35] phy: renesas: rcar-gen2: Fix memory leak at error paths Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 12/35] powerpc/pseries/mobility: prevent cpu hotplug during DT update Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 13/35] powerpc/pseries/mobility: rebuild cacheinfo hierarchy post-migration Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 14/35] usb: gadget: Zero ffs_io_data Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 15/35] powerpc/pci/of: Fix OF flags parsing for 64bit BARs Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 16/35] PCI: sysfs: Ignore lockdep for remove attribute Sasha Levin
2019-07-19  4:14 ` Sasha Levin [this message]
2019-07-21 17:23   ` [PATCH AUTOSEL 4.4 17/35] iio: st_accel: fix iio_triggered_buffer_{pre,post}enable positions Jonathan Cameron
2019-07-22  6:47     ` Ardelean, Alexandru
2019-07-28 15:43       ` Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 18/35] iio: iio-utils: Fix possible incorrect mask calculation Sasha Levin
2019-07-21 17:27   ` Jonathan Cameron
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 19/35] recordmcount: Fix spurious mcount entries on powerpc Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 20/35] mfd: core: Set fwnode for created devices Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 21/35] mfd: arizona: Fix undefined behavior Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 22/35] um: Silence lockdep complaint about mmap_sem Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 23/35] powerpc/4xx/uic: clear pending interrupt after irq type/pol change Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 24/35] serial: sh-sci: Fix TX DMA buffer flushing and workqueue races Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 25/35] PCI: tegra: Enable Relaxed Ordering only for Tegra20 & Tegra30 Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 26/35] kallsyms: exclude kasan local symbols on s390 Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 27/35] perf test mmap-thread-lookup: Initialize variable to suppress memory sanitizer warning Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 28/35] f2fs: avoid out-of-range memory access Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 29/35] mailbox: handle failed named mailbox channel request Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 30/35] powerpc/eeh: Handle hugepages in ioremap space Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 31/35] sh: prevent warnings when using iounmap Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 32/35] mm/kmemleak.c: fix check for softirq context Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 33/35] 9p: pass the correct prototype to read_cache_page Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 34/35] mm/mmu_notifier: use hlist_add_head_rcu() Sasha Levin
2019-07-19  4:14 ` [PATCH AUTOSEL 4.4 35/35] locking/lockdep: Fix lock used or unused stats error Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190719041423.19322-17-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=Jonathan.Cameron@huawei.com \
    --cc=alexandru.ardelean@analog.com \
    --cc=denis.ciocca@st.com \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).