linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/4] mfd/ab8500: fix error path bug
@ 2012-02-01 16:09 Linus Walleij
  2012-02-01 16:24 ` Maxime Coquelin
  0 siblings, 1 reply; 3+ messages in thread
From: Linus Walleij @ 2012-02-01 16:09 UTC (permalink / raw)
  To: Samuel Ortiz, linux-kernel
  Cc: Mark Brown, Linus Walleij, Maxime Coquelin, Alex Macro, Michel Jaouen

From: Linus Walleij <linus.walleij@linaro.org>

We were not freeing the irq properly in the error path in
the AB8500 driver.

Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@stericsson.com>
Signed-off-by: Alex Macro <alex.macro@stericsson.com>
Signed-off-by: Michel Jaouen <michel.jaouen@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 drivers/mfd/ab8500-core.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index 53e2a80..bf823d2 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -956,9 +956,10 @@ int __devinit ab8500_init(struct ab8500 *ab8500)
 	return ret;
 
 out_freeirq:
-	if (ab8500->irq_base) {
+	if (ab8500->irq_base)
 		free_irq(ab8500->irq, ab8500);
 out_removeirq:
+	if (ab8500->irq_base)
 		ab8500_irq_remove(ab8500);
 	}
 	return ret;
-- 
1.7.8


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/4] mfd/ab8500: fix error path bug
  2012-02-01 16:09 [PATCH 1/4] mfd/ab8500: fix error path bug Linus Walleij
@ 2012-02-01 16:24 ` Maxime Coquelin
  2012-02-01 20:28   ` Linus Walleij
  0 siblings, 1 reply; 3+ messages in thread
From: Maxime Coquelin @ 2012-02-01 16:24 UTC (permalink / raw)
  To: Linus WALLEIJ
  Cc: Samuel Ortiz, linux-kernel, Mark Brown, Linus Walleij,
	Alex MACRO, Michel JAOUEN

Hi Linus,

On 02/01/2012 05:09 PM, Linus WALLEIJ wrote:
> From: Linus Walleij<linus.walleij@linaro.org>
>
> We were not freeing the irq properly in the error path in
> the AB8500 driver.
>
> Cc: Mark Brown<broonie@opensource.wolfsonmicro.com>
> Signed-off-by: Maxime Coquelin<maxime.coquelin@stericsson.com>
> Signed-off-by: Alex Macro<alex.macro@stericsson.com>
> Signed-off-by: Michel Jaouen<michel.jaouen@stericsson.com>
> Signed-off-by: Linus Walleij<linus.walleij@linaro.org>
> ---
>   drivers/mfd/ab8500-core.c |    3 ++-
>   1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
> index 53e2a80..bf823d2 100644
> --- a/drivers/mfd/ab8500-core.c
> +++ b/drivers/mfd/ab8500-core.c
> @@ -956,9 +956,10 @@ int __devinit ab8500_init(struct ab8500 *ab8500)
>   	return ret;
>
>   out_freeirq:
> -	if (ab8500->irq_base) {
> +	if (ab8500->irq_base)
>   		free_irq(ab8500->irq, ab8500);
>   out_removeirq:
> +	if (ab8500->irq_base)
>   		ab8500_irq_remove(ab8500);
>   	}
Shouldn't the above brace to be removed?
>   	return ret;

Regards,
Maxime

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/4] mfd/ab8500: fix error path bug
  2012-02-01 16:24 ` Maxime Coquelin
@ 2012-02-01 20:28   ` Linus Walleij
  0 siblings, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2012-02-01 20:28 UTC (permalink / raw)
  To: Maxime Coquelin
  Cc: Linus WALLEIJ, Samuel Ortiz, linux-kernel, Mark Brown,
	Alex MACRO, Michel JAOUEN

On Wed, Feb 1, 2012 at 5:24 PM, Maxime Coquelin
<maxime.coquelin@stericsson.com> wrote:
> On 02/01/2012 05:09 PM, Linus WALLEIJ wrote:

>> --- a/drivers/mfd/ab8500-core.c
>> +++ b/drivers/mfd/ab8500-core.c
>> @@ -956,9 +956,10 @@ int __devinit ab8500_init(struct ab8500 *ab8500)
>>        return ret;
>>
>>  out_freeirq:
>> -       if (ab8500->irq_base) {
>> +       if (ab8500->irq_base)
>>                free_irq(ab8500->irq, ab8500);
>>  out_removeirq:
>> +       if (ab8500->irq_base)
>>                ab8500_irq_remove(ab8500);
>>        }
>
> Shouldn't the above brace to be removed?

Yes of course, thanks for spotting this! Fixed it in my patch queue.

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-02-01 20:28 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-01 16:09 [PATCH 1/4] mfd/ab8500: fix error path bug Linus Walleij
2012-02-01 16:24 ` Maxime Coquelin
2012-02-01 20:28   ` Linus Walleij

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).