linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] iio: adis16480: fix FNCTIO_CTRL corruption when enabling IRQ
@ 2016-03-09  5:28 Vlad Banea
  2016-03-09  9:22 ` Lars-Peter Clausen
  0 siblings, 1 reply; 6+ messages in thread
From: Vlad Banea @ 2016-03-09  5:28 UTC (permalink / raw)
  To: lars, jic23, Michael.Hennerich; +Cc: linux-kernel, Vlad Banea

Enabling the IRQ should leave all other settings in the FNCTIO_CTRL
register untouched: read the whole register, toggle just the enable bit,
before writing it back.
---
 drivers/iio/imu/adis16480.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/imu/adis16480.c b/drivers/iio/imu/adis16480.c
index b94bfd3..8473859 100644
--- a/drivers/iio/imu/adis16480.c
+++ b/drivers/iio/imu/adis16480.c
@@ -738,8 +738,19 @@ static int adis16480_stop_device(struct iio_dev *indio_dev)
 
 static int adis16480_enable_irq(struct adis *adis, bool enable)
 {
-	return adis_write_reg_16(adis, ADIS16480_REG_FNCTIO_CTRL,
-		enable ? BIT(3) : 0);
+	u16 fnctio_ctrl;
+	int ret;
+
+	ret = adis_read_reg_16(adis, ADIS16480_REG_FNCTIO_CTRL, &fnctio_ctrl);
+	if (ret < 0)
+		return ret;
+
+	if (enable)
+		fnctio_ctrl |= BIT(3);
+	else
+		fnctio_ctrl &= ~BIT(3);
+
+	return adis_write_reg_16(adis, ADIS16480_REG_FNCTIO_CTRL, fnctio_ctrl);
 }
 
 static int adis16480_initial_setup(struct iio_dev *indio_dev)
-- 
2.7.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-03-12 11:14 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-09  5:28 [PATCH] iio: adis16480: fix FNCTIO_CTRL corruption when enabling IRQ Vlad Banea
2016-03-09  9:22 ` Lars-Peter Clausen
     [not found]   ` <CACBkv7uBy_eJv5aZRvaHAn6VY0rrjJkWF4mBXvv9_4wFJA9qiQ@mail.gmail.com>
2016-03-09 12:21     ` Lars-Peter Clausen
     [not found]       ` <CACBkv7v=D7frj6Uo7c9pd5aohVv_OUJU4jpoHdhP+S5KgmqHAw@mail.gmail.com>
2016-03-09 16:41         ` Lars-Peter Clausen
2016-03-09 17:06           ` Vlad Banea
2016-03-12 11:14             ` Jonathan Cameron

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