[patch] iio: humidity: Remove a stray unlock

[patch] iio: humidity: Remove a stray unlock

[Dan Carpenter]

We haven't taken the lock yet so we don't need to unlock here.

Fixes: 0d96d5ead3f7 ('iio: humidity: Add triggered buffer support for AM2315')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/iio/humidity/am2315.c b/drivers/iio/humidity/am2315.c
index 3be6d20..1153591 100644
--- a/drivers/iio/humidity/am2315.c
+++ b/drivers/iio/humidity/am2315.c
@@ -165,10 +165,8 @@ static irqreturn_t am2315_trigger_handler(int irq, void *p)
 	struct am2315_sensor_data sensor_data;
 
 	ret = am2315_read_data(data, &sensor_data);
-	if (ret < 0) {
-		mutex_unlock(&data->lock);
+	if (ret < 0)
 		goto err;
-	}
 
 	mutex_lock(&data->lock);
 	if (*(indio_dev->active_scan_mask) = AM2315_ALL_CHANNEL_MASK) {

RE: [patch] iio: humidity: Remove a stray unlock

[Breana, Tiberiu A]

> -----Original Message-----
> From: Dan Carpenter [mailto:dan.carpenter@oracle.com]
> Sent: Tuesday, May 17, 2016 10:32 AM
> To: Jonathan Cameron <jic23@kernel.org>; Breana, Tiberiu A
> <tiberiu.a.breana@intel.com>
> Cc: Hartmut Knaack <knaack.h@gmx.de>; Lars-Peter Clausen
> <lars@metafoo.de>; Peter Meerwald-Stadler <pmeerw@pmeerw.net>;
> linux-iio@vger.kernel.org; kernel-janitors@vger.kernel.org
> Subject: [patch] iio: humidity: Remove a stray unlock
> 
> We haven't taken the lock yet so we don't need to unlock here.
> 
> Fixes: 0d96d5ead3f7 ('iio: humidity: Add triggered buffer support for
> AM2315')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> diff --git a/drivers/iio/humidity/am2315.c b/drivers/iio/humidity/am2315.c
> index 3be6d20..1153591 100644
> --- a/drivers/iio/humidity/am2315.c
> +++ b/drivers/iio/humidity/am2315.c
> @@ -165,10 +165,8 @@ static irqreturn_t am2315_trigger_handler(int irq,
> void *p)
>  	struct am2315_sensor_data sensor_data;
> 
>  	ret = am2315_read_data(data, &sensor_data);
> -	if (ret < 0) {
> -		mutex_unlock(&data->lock);
> +	if (ret < 0)
>  		goto err;
> -	}
> 
>  	mutex_lock(&data->lock);
>  	if (*(indio_dev->active_scan_mask) =
> AM2315_ALL_CHANNEL_MASK) {

That one must have slipped by during development versions.
You might also want to add am2315 in the patch title.
Thanks,

Acked-by: Tiberiu Breana <tiberiu.a.breana@intel.com>

Re: [patch] iio: humidity: Remove a stray unlock

[Dan Carpenter]

On Tue, May 17, 2016 at 07:43:21AM +0000, Breana, Tiberiu A wrote:
> That one must have slipped by during development versions.
> You might also want to add am2315 in the patch title.

Yeah.  I'll resend.

I obviously just mindlessly cut and pasted that from the earlier patch:
Fixes: 0d96d5ead3f7 ('iio: humidity: Add triggered buffer support for AM2315')
That patch also has the wrong subject line because it was just copied
from the first patch 366a3270c1c5 ('iio: humidity: Add support for
AM2315').

And just a few minutes ago I was giving another new driver its own
prefix.  But even though I thought--more than I should have--about
what the author wanted to use as a prefix for his driver, I still
probably read his mind incorrectly.

In other words, we need to start with the correct prefix from square
one:  iio: humidity: am2315: Add support for AM2315

regards,
dan carpenter

[patch v2] iio: humidity: am2315: Remove a stray unlock

[Dan Carpenter]

We haven't taken the lock yet so we don't need to unlock here.

Fixes: 0d96d5ead3f7 ('iio: humidity: Add triggered buffer support for AM2315')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Tiberiu Breana <tiberiu.a.breana@intel.com>
---
v2: update subject

diff --git a/drivers/iio/humidity/am2315.c b/drivers/iio/humidity/am2315.c
index 3be6d20..1153591 100644
--- a/drivers/iio/humidity/am2315.c
+++ b/drivers/iio/humidity/am2315.c
@@ -165,10 +165,8 @@ static irqreturn_t am2315_trigger_handler(int irq, void *p)
 	struct am2315_sensor_data sensor_data;
 
 	ret = am2315_read_data(data, &sensor_data);
-	if (ret < 0) {
-		mutex_unlock(&data->lock);
+	if (ret < 0)
 		goto err;
-	}
 
 	mutex_lock(&data->lock);
 	if (*(indio_dev->active_scan_mask) = AM2315_ALL_CHANNEL_MASK) {

Re: [patch v2] iio: humidity: am2315: Remove a stray unlock

[Jonathan Cameron]

On 17/05/16 09:02, Dan Carpenter wrote:
> We haven't taken the lock yet so we don't need to unlock here.
> 
> Fixes: 0d96d5ead3f7 ('iio: humidity: Add triggered buffer support for AM2315')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> Acked-by: Tiberiu Breana <tiberiu.a.breana@intel.com>
Applied to the fixes-togreg-post-rc1 branch of iio.git

Thanks,

Jonathan
> ---
> v2: update subject
> 
> diff --git a/drivers/iio/humidity/am2315.c b/drivers/iio/humidity/am2315.c
> index 3be6d20..1153591 100644
> --- a/drivers/iio/humidity/am2315.c
> +++ b/drivers/iio/humidity/am2315.c
> @@ -165,10 +165,8 @@ static irqreturn_t am2315_trigger_handler(int irq, void *p)
>  	struct am2315_sensor_data sensor_data;
>  
>  	ret = am2315_read_data(data, &sensor_data);
> -	if (ret < 0) {
> -		mutex_unlock(&data->lock);
> +	if (ret < 0)
>  		goto err;
> -	}
>  
>  	mutex_lock(&data->lock);
>  	if (*(indio_dev->active_scan_mask) = AM2315_ALL_CHANNEL_MASK) {
>