From: Jonathan Cameron <jic23@jic23.retrosnub.co.uk>
To: Angelo Compagnucci <angelo.compagnucci@gmail.com>
Cc: linux-iio@vger.kernel.org,
Angelo Compagnucci <angelo@amarulasolutions.com>
Subject: Re: [PATCH] iio: adc: mcp3422: fix locking scope
Date: Sat, 1 Aug 2020 17:46:33 +0100 [thread overview]
Message-ID: <20200801174633.08cee9d1@archlinux> (raw)
In-Reply-To: <20200801135511.342869-1-angelo@amarulasolutions.com>
On Sat, 1 Aug 2020 15:55:11 +0200
Angelo Compagnucci <angelo.compagnucci@gmail.com> wrote:
> Locking should be held for the entire reading sequence involving setting
> the channel, waiting for the channel switch and reading from the
> channel.
> If not, reading from a channel can result mixing with the reading from
> another channel.
>
> Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
Looks like we should be backporting this. Fixes tag please.
Jonathan
> ---
> drivers/iio/adc/mcp3422.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c
> index d86c0b5d80a3..02a60fb164cd 100644
> --- a/drivers/iio/adc/mcp3422.c
> +++ b/drivers/iio/adc/mcp3422.c
> @@ -96,16 +96,12 @@ static int mcp3422_update_config(struct mcp3422 *adc, u8 newconfig)
> {
> int ret;
>
> - mutex_lock(&adc->lock);
> -
> ret = i2c_master_send(adc->i2c, &newconfig, 1);
> if (ret > 0) {
> adc->config = newconfig;
> ret = 0;
> }
>
> - mutex_unlock(&adc->lock);
> -
> return ret;
> }
>
> @@ -138,6 +134,8 @@ static int mcp3422_read_channel(struct mcp3422 *adc,
> u8 config;
> u8 req_channel = channel->channel;
>
> + mutex_lock(&adc->lock);
> +
> if (req_channel != MCP3422_CHANNEL(adc->config)) {
> config = adc->config;
> config &= ~MCP3422_CHANNEL_MASK;
> @@ -150,7 +148,11 @@ static int mcp3422_read_channel(struct mcp3422 *adc,
> msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]);
> }
>
> - return mcp3422_read(adc, value, &config);
> + ret = mcp3422_read(adc, value, &config);
> +
> + mutex_unlock(&adc->lock);
> +
> + return ret;
> }
>
> static int mcp3422_read_raw(struct iio_dev *iio,
next prev parent reply other threads:[~2020-08-01 16:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-01 13:55 [PATCH] iio: adc: mcp3422: fix locking scope Angelo Compagnucci
2020-08-01 16:46 ` Jonathan Cameron [this message]
2020-08-14 6:24 ` Angelo Compagnucci
2020-08-16 9:14 ` 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=20200801174633.08cee9d1@archlinux \
--to=jic23@jic23.retrosnub.co.uk \
--cc=angelo.compagnucci@gmail.com \
--cc=angelo@amarulasolutions.com \
--cc=linux-iio@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).