From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Anders Darander <anders@chargestorm.se>
Cc: linux-iio@vger.kernel.org, jic23@kernel.org, knaack.h@gmx.de,
lars@metafoo.de, pmeerw@pmeerw.net, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] iio: adc: at91: unbreak channel adc channel 3
Date: Mon, 8 Aug 2016 15:52:43 +0200 [thread overview]
Message-ID: <20160808135243.GA19793@piout.net> (raw)
In-Reply-To: <1470660136-12524-1-git-send-email-anders@chargestorm.se>
On 08/08/2016 at 14:42:16 +0200, Anders Darander wrote :
> The driver always assumes that an input device has been created when
> reading channel 3. This causes a kernel panic when dereferencing
> st->ts_input.
>
> The change was introduced in
> commit 84882b060301 ("iio: adc: at91_adc: Add support for touchscreens
> without TSMR"). Earlier versions only entered that part of the if-else
> statement if only the following flags are set:
>
> AT91_ADC_IER_XRDY | AT91_ADC_IER_YRDY | AT91_ADC_IER_PRDY
>
> Signed-off-by: Anders Darander <anders@chargestorm.se>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
> drivers/iio/adc/at91_adc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
> index 52430ba..0438c68 100644
> --- a/drivers/iio/adc/at91_adc.c
> +++ b/drivers/iio/adc/at91_adc.c
> @@ -381,8 +381,8 @@ static irqreturn_t at91_adc_rl_interrupt(int irq, void *private)
> st->ts_bufferedmeasure = false;
> input_report_key(st->ts_input, BTN_TOUCH, 0);
> input_sync(st->ts_input);
> - } else if (status & AT91_ADC_EOC(3)) {
> - /* Conversion finished */
> + } else if (status & AT91_ADC_EOC(3) && st->ts_input) {
> + /* Conversion finished and we've a touchscreen */
> if (st->ts_bufferedmeasure) {
> /*
> * Last measurement is always discarded, since it can
> --
> 2.8.1
>
--
Alexandre Belloni, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
next prev parent reply other threads:[~2016-08-08 13:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-08 12:42 [PATCH] iio: adc: at91: unbreak channel adc channel 3 Anders Darander
2016-08-08 13:52 ` Alexandre Belloni [this message]
2016-08-15 16:15 ` 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=20160808135243.GA19793@piout.net \
--to=alexandre.belloni@free-electrons.com \
--cc=anders@chargestorm.se \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
/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).