linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Cameron <jic23@kernel.org>
To: Harald Geyer <harald@ccbib.org>
Cc: Richard Weinberger <richard@nod.at>,
	knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net,
	sanjeev_sharma@mentor.com, linux-iio@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCHv2 2/3,RESEND] iio: dht11: Add locking
Date: Sat, 10 Jan 2015 11:16:00 +0000	[thread overview]
Message-ID: <54B109F0.5060101@kernel.org> (raw)
In-Reply-To: <E1Y8pZ9-000133-AF@stardust.g4.wien.funkfeuer.at>

On 07/01/15 12:18, Harald Geyer wrote:
> Make sure that the read function is not interrupted...
> 
> From: Richard Weinberger <richard@nod.at>
> Signed-off-by: Richard Weinberger <richard@nod.at>
> Acked-by: Harald Geyer <harald@ccbib.org>
> Reviewed-by: Sanjeev Sharma <sanjeev_sharma@mentor.com>
> ---
> Resending again to get the metadata right.
> No Signed-off-by from me, because I didn't contribute anything.
Technically you 'handled' the patch which is all that actually
matters for a sign-off.  Anyhow I don't really care either way ;)

Applied to the fixes-togreg branch of iio.git

Thanks,

Jonathan
> No changes since v1 except reordering.
> 
>  drivers/iio/humidity/dht11.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/iio/humidity/dht11.c b/drivers/iio/humidity/dht11.c
> index f546eca..7717f5c 100644
> --- a/drivers/iio/humidity/dht11.c
> +++ b/drivers/iio/humidity/dht11.c
> @@ -29,6 +29,7 @@
>  #include <linux/wait.h>
>  #include <linux/bitops.h>
>  #include <linux/completion.h>
> +#include <linux/mutex.h>
>  #include <linux/delay.h>
>  #include <linux/gpio.h>
>  #include <linux/of_gpio.h>
> @@ -57,6 +58,7 @@ struct dht11 {
>  	int				irq;
>  
>  	struct completion		completion;
> +	struct mutex			lock;
>  
>  	s64				timestamp;
>  	int				temperature;
> @@ -145,6 +147,7 @@ static int dht11_read_raw(struct iio_dev *iio_dev,
>  	struct dht11 *dht11 = iio_priv(iio_dev);
>  	int ret;
>  
> +	mutex_lock(&dht11->lock);
>  	if (dht11->timestamp + DHT11_DATA_VALID_TIME < iio_get_time_ns()) {
>  		reinit_completion(&dht11->completion);
>  
> @@ -185,6 +188,7 @@ static int dht11_read_raw(struct iio_dev *iio_dev,
>  		ret = -EINVAL;
>  err:
>  	dht11->num_edges = -1;
> +	mutex_unlock(&dht11->lock);
>  	return ret;
>  }
>  
> @@ -268,6 +272,7 @@ static int dht11_probe(struct platform_device *pdev)
>  	platform_set_drvdata(pdev, iio);
>  
>  	init_completion(&dht11->completion);
> +	mutex_init(&dht11->lock);
>  	iio->name = pdev->name;
>  	iio->dev.parent = &pdev->dev;
>  	iio->info = &dht11_iio_info;
> 


  reply	other threads:[~2015-01-10 11:16 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-02 23:32 iio: dht11 Updates Richard Weinberger
2014-12-02 23:32 ` [PATCH 1/4] iio: dht11: Add locking Richard Weinberger
2014-12-14 12:31   ` Hartmut Knaack
2014-12-14 14:06     ` Richard Weinberger
2014-12-02 23:32 ` [PATCH 2/4] iio: dht11: IRQ fixes Richard Weinberger
2014-12-02 23:35   ` Richard Weinberger
2014-12-06 17:21   ` harald
2014-12-02 23:32 ` [PATCH 3/4] iio: dht11: Logging updates Richard Weinberger
2014-12-03 12:58   ` Harald Geyer
2014-12-03 13:11     ` Richard Weinberger
2014-12-03 13:56       ` Harald Geyer
2014-12-03 21:30         ` Richard Weinberger
2014-12-04 14:25           ` Harald Geyer
2014-12-02 23:32 ` [PATCH 4/4] iio: dht11: Fix out-of-bounds read Richard Weinberger
2014-12-14 12:32   ` Hartmut Knaack
2014-12-03 12:18 ` iio: dht11 Updates Harald Geyer
2014-12-03 13:15   ` Richard Weinberger
2014-12-03 14:08     ` Harald Geyer
2014-12-03 14:29       ` Richard Weinberger
2014-12-03 22:05       ` Richard Weinberger
2014-12-04 13:45         ` Harald Geyer
2014-12-04 14:15           ` Richard Weinberger
2014-12-03 20:20   ` Richard Weinberger
2014-12-04 16:08     ` Harald Geyer
2015-01-01 12:38 ` Jonathan Cameron
2015-01-01 21:18   ` harald
2015-01-02 11:28     ` Richard Weinberger
2015-01-04 11:01       ` Jonathan Cameron
2015-01-05 13:49         ` [PATCHv2 1/3] iio: dht11: Fix out-of-bounds read Harald Geyer
2015-01-05 13:55           ` Richard Weinberger
2015-01-06  5:39             ` sanjeev sharma
2015-01-07 12:15             ` [PATCHv2 1/3,RESEND] " Harald Geyer
2015-01-10 11:14               ` Jonathan Cameron
2015-01-10 18:39                 ` Richard Weinberger
2015-01-12 11:26                   ` Harald Geyer
2015-01-12 11:27                     ` Richard Weinberger
2015-01-07 12:18             ` [PATCHv2 2/3,RESEND] iio: dht11: Add locking Harald Geyer
2015-01-10 11:16               ` Jonathan Cameron [this message]
2015-02-22 10:44                 ` Richard Weinberger
2015-02-25 12:01                   ` Jonathan Cameron
2015-01-07 12:22             ` [PATCHv2 3/3,RESEND] iio: dht11: IRQ fixes Harald Geyer

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=54B109F0.5060101@kernel.org \
    --to=jic23@kernel.org \
    --cc=harald@ccbib.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 \
    --cc=richard@nod.at \
    --cc=sanjeev_sharma@mentor.com \
    /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).