From: Jonathan Cameron <jic23@kernel.org>
To: Peter Meerwald <pmeerw@pmeerw.net>, linux-iio@vger.kernel.org
Subject: Re: [PATCH 1/3] iio:tcs3472: Check for buffer enabled and locking
Date: Mon, 07 Jul 2014 09:00:20 +0100 [thread overview]
Message-ID: <53BA5394.7080208@kernel.org> (raw)
In-Reply-To: <1404563914-27516-2-git-send-email-pmeerw@pmeerw.net>
On 05/07/14 13:38, Peter Meerwald wrote:
> From: Peter Meerwald <p.meerwald@bct-electronic.com>
>
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Applied to the fixes-togreg branch of iio.git
Thanks Peter,
> ---
> drivers/iio/light/tcs3472.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/light/tcs3472.c b/drivers/iio/light/tcs3472.c
> index fe063a0..7525699 100644
> --- a/drivers/iio/light/tcs3472.c
> +++ b/drivers/iio/light/tcs3472.c
> @@ -52,6 +52,7 @@
>
> struct tcs3472_data {
> struct i2c_client *client;
> + struct mutex lock;
> u8 enable;
> u8 control;
> u8 atime;
> @@ -116,10 +117,17 @@ static int tcs3472_read_raw(struct iio_dev *indio_dev,
>
> switch (mask) {
> case IIO_CHAN_INFO_RAW:
> + if (iio_buffer_enabled(indio_dev))
> + return -EBUSY;
> +
> + mutex_lock(&data->lock);
> ret = tcs3472_req_data(data);
> - if (ret < 0)
> + if (ret < 0) {
> + mutex_unlock(&data->lock);
> return ret;
> + }
> ret = i2c_smbus_read_word_data(data->client, chan->address);
> + mutex_unlock(&data->lock);
> if (ret < 0)
> return ret;
> *val = ret;
> @@ -255,6 +263,7 @@ static int tcs3472_probe(struct i2c_client *client,
> data = iio_priv(indio_dev);
> i2c_set_clientdata(client, indio_dev);
> data->client = client;
> + mutex_init(&data->lock);
>
> indio_dev->dev.parent = &client->dev;
> indio_dev->info = &tcs3472_info;
>
next prev parent reply other threads:[~2014-07-07 7:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-05 12:38 [PATCH 0/3] iio: new color light sensor drivers Peter Meerwald
2014-07-05 12:38 ` [PATCH 1/3] iio:tcs3472: Check for buffer enabled and locking Peter Meerwald
2014-07-07 8:00 ` Jonathan Cameron [this message]
2014-07-05 12:38 ` [PATCH 2/3] iio: Add Intersil isl29125 digital color light sensor driver Peter Meerwald
2014-07-07 8:15 ` Jonathan Cameron
2014-07-05 12:38 ` [PATCH 3/3] iio: Add driver for AMS/TAOS tcs3414 digital color sensor Peter Meerwald
2014-07-07 8:33 ` 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=53BA5394.7080208@kernel.org \
--to=jic23@kernel.org \
--cc=linux-iio@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.