From: Philippe Schenker <dev@pschenker.ch>
To: linux-iio@vger.kernel.org, Jonathan Cameron <jic23@kernel.org>,
Stefan Agner <stefan@agner.ch>, Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Cc: dev@pschenker.ch,
Philippe Schenker <philippe.schenker@toradex.com>,
Max Krummenacher <max.krummenacher@toradex.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
linux-kernel@vger.kernel.org, Lee Jones <lee.jones@linaro.org>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/3] iio: stmpe-adc: Make wait_completion non interruptible
Date: Fri, 3 May 2019 15:57:24 +0200 [thread overview]
Message-ID: <20190503135725.9959-2-dev@pschenker.ch> (raw)
In-Reply-To: <20190503135725.9959-1-dev@pschenker.ch>
From: Philippe Schenker <philippe.schenker@toradex.com>
In some cases, the wait_completion got interrupted. This caused the
error-handling to mutex_unlock the function. The before turned on
interrupt then got called anyway. In the ISR then completion()
was called causing problems.
Making this wait_completion non interruptible solves the problem.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
---
drivers/iio/adc/stmpe-adc.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/iio/adc/stmpe-adc.c b/drivers/iio/adc/stmpe-adc.c
index 87141177fbda..baa41ffc0d76 100644
--- a/drivers/iio/adc/stmpe-adc.c
+++ b/drivers/iio/adc/stmpe-adc.c
@@ -78,8 +78,7 @@ static int stmpe_read_voltage(struct stmpe_adc *info,
stmpe_reg_write(info->stmpe, STMPE_REG_ADC_CAPT,
STMPE_ADC_CH(info->channel));
- ret = wait_for_completion_interruptible_timeout
- (&info->completion, STMPE_ADC_TIMEOUT);
+ ret = wait_for_completion_timeout(&info->completion, STMPE_ADC_TIMEOUT);
if (ret <= 0) {
mutex_unlock(&info->lock);
@@ -113,8 +112,7 @@ static int stmpe_read_temp(struct stmpe_adc *info,
stmpe_reg_write(info->stmpe, STMPE_REG_TEMP_CTRL,
STMPE_START_ONE_TEMP_CONV);
- ret = wait_for_completion_interruptible_timeout
- (&info->completion, STMPE_ADC_TIMEOUT);
+ ret = wait_for_completion_timeout(&info->completion, STMPE_ADC_TIMEOUT);
if (ret <= 0) {
mutex_unlock(&info->lock);
--
2.21.0
next prev parent reply other threads:[~2019-05-03 14:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-03 13:57 [PATCH 1/3] iio: stmpe-adc: Remove unnecessary assignment Philippe Schenker
2019-05-03 13:57 ` Philippe Schenker [this message]
2019-05-03 14:39 ` [PATCH 2/3] iio: stmpe-adc: Make wait_completion non interruptible David Laight
2019-05-03 15:58 ` Philippe Schenker
[not found] ` <20190505164409.7976f43e@archlinux>
[not found] ` <4df31129d19c4128a4bbc5e0575886af@AcuMS.aculab.com>
2019-05-07 14:31 ` Philippe Schenker
2019-05-03 13:57 ` [PATCH 3/3] iio: stmpe-adc: Enable all stmpe-adc interrupts just once Philippe Schenker
2019-05-05 15:45 ` Jonathan Cameron
2019-05-07 14:32 ` Philippe Schenker
2019-05-05 15:39 ` [PATCH 1/3] iio: stmpe-adc: Remove unnecessary assignment Jonathan Cameron
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=20190503135725.9959-2-dev@pschenker.ch \
--to=dev@pschenker.ch \
--cc=alexandre.torgue@st.com \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=max.krummenacher@toradex.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=philippe.schenker@toradex.com \
--cc=pmeerw@pmeerw.net \
--cc=stefan@agner.ch \
/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).