[PATCH] MFD: ezx-pcap, fix lock imbalance

[PATCH] MFD: ezx-pcap, fix lock imbalance

[Jiri Slaby]

There is an omitted unlock in pcap_adc_irq ISR on one fail path. Fix that.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
 drivers/mfd/ezx-pcap.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
index 671a7ef..c1de4af 100644
--- a/drivers/mfd/ezx-pcap.c
+++ b/drivers/mfd/ezx-pcap.c
@@ -238,8 +238,10 @@ static irqreturn_t pcap_adc_irq(int irq, void *_pcap)
 	mutex_lock(&pcap->adc_mutex);
 	req = pcap->adc_queue[pcap->adc_head];
 
-	if (WARN(!req, KERN_WARNING "adc irq without pending request\n"))
+	if (WARN(!req, KERN_WARNING "adc irq without pending request\n")) {
+		mutex_unlock(&pcap->adc_mutex);
 		return IRQ_HANDLED;
+	}
 
 	/* read requested channels results */
 	ezx_pcap_read(pcap, PCAP_REG_ADC, &tmp);
-- 
1.6.3.2

Re: [PATCH] MFD: ezx-pcap, fix lock imbalance

[Daniel Ribeiro]

[-- Attachment #1: Type: text/plain, Size: 1153 bytes --]

Hi Jiri,

Em Qua, 2009-07-01 às 08:53 +0200, Jiri Slaby escreveu:
> There is an omitted unlock in pcap_adc_irq ISR on one fail path. Fix that.
> 
> Signed-off-by: Jiri Slaby <jirislaby@gmail.com>

I would be happy to ack this, however, you are late. ;)

http://patchwork.kernel.org/patch/32002/

Samuel seems to be unreachable ATM, last email I have from him is from
June 16. :(

> ---
>  drivers/mfd/ezx-pcap.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
> index 671a7ef..c1de4af 100644
> --- a/drivers/mfd/ezx-pcap.c
> +++ b/drivers/mfd/ezx-pcap.c
> @@ -238,8 +238,10 @@ static irqreturn_t pcap_adc_irq(int irq, void *_pcap)
>  	mutex_lock(&pcap->adc_mutex);
>  	req = pcap->adc_queue[pcap->adc_head];
>  
> -	if (WARN(!req, KERN_WARNING "adc irq without pending request\n"))
> +	if (WARN(!req, KERN_WARNING "adc irq without pending request\n")) {
> +		mutex_unlock(&pcap->adc_mutex);
>  		return IRQ_HANDLED;
> +	}
>  
>  	/* read requested channels results */
>  	ezx_pcap_read(pcap, PCAP_REG_ADC, &tmp);

-- 
Daniel Ribeiro

[-- Attachment #2: Esta é uma parte de mensagem assinada digitalmente --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH] MFD: ezx-pcap, fix lock imbalance

[Jiri Slaby]

On 07/01/2009 09:04 AM, Daniel Ribeiro wrote:
> Em Qua, 2009-07-01 às 08:53 +0200, Jiri Slaby escreveu:
>> There is an omitted unlock in pcap_adc_irq ISR on one fail path. Fix that.
>>
>> Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
> 
> I would be happy to ack this, however, you are late. ;)

Heh :), nevermind.

Re: [PATCH] MFD: ezx-pcap, fix lock imbalance

[Samuel Ortiz]

Hi Daniel,

On Wed, Jul 01, 2009 at 04:04:31AM -0300, Daniel Ribeiro wrote:
> Hi Jiri,
> 
> Em Qua, 2009-07-01 às 08:53 +0200, Jiri Slaby escreveu:
> > There is an omitted unlock in pcap_adc_irq ISR on one fail path. Fix that.
> > 
> > Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
> 
> I would be happy to ack this, however, you are late. ;)
> 
> http://patchwork.kernel.org/patch/32002/
> 
> Samuel seems to be unreachable ATM, last email I have from him is from
> June 16. :(
Sorry for the delay, I was travelling. I'll be going through my mail backlog
today.

Cheers,
Samuel.


> > ---
> >  drivers/mfd/ezx-pcap.c |    4 +++-
> >  1 files changed, 3 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
> > index 671a7ef..c1de4af 100644
> > --- a/drivers/mfd/ezx-pcap.c
> > +++ b/drivers/mfd/ezx-pcap.c
> > @@ -238,8 +238,10 @@ static irqreturn_t pcap_adc_irq(int irq, void *_pcap)
> >  	mutex_lock(&pcap->adc_mutex);
> >  	req = pcap->adc_queue[pcap->adc_head];
> >  
> > -	if (WARN(!req, KERN_WARNING "adc irq without pending request\n"))
> > +	if (WARN(!req, KERN_WARNING "adc irq without pending request\n")) {
> > +		mutex_unlock(&pcap->adc_mutex);
> >  		return IRQ_HANDLED;
> > +	}
> >  
> >  	/* read requested channels results */
> >  	ezx_pcap_read(pcap, PCAP_REG_ADC, &tmp);
> 
> -- 
> Daniel Ribeiro



-- 
Intel Open Source Technology Centre
http://oss.intel.com/