2011-06-01 17:10:22

by Julia Lawall

Subject: [PATCH 2/10] sound/soc/nuc900/nuc900-ac97.c: add missing clk_put

From: Julia Lawall <[email protected]>

This goto is after the call to clk_get, so it should go to the label that
includes a call to clk_put.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@r exists@
expression e1,e2;
statement S;
@@

e1 = clk_get@p1(...);
... when != e1 = e2
when != clk_put(e1)
when any
if (...) { ... when != clk_put(e1)
when != if (...) { ... clk_put(e1) ... }
* return@p3 ...;
} else S
// </smpl>

Signed-off-by: Julia Lawall <[email protected]>

---
sound/soc/nuc900/nuc900-ac97.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c
index dac6732..9c0edad 100644
--- a/sound/soc/nuc900/nuc900-ac97.c
+++ b/sound/soc/nuc900/nuc900-ac97.c
@@ -356,7 +356,7 @@ static int __devinit nuc900_ac97_drvprobe(struct platform_device *pdev)
nuc900_audio->irq_num = platform_get_irq(pdev, 0);
if (!nuc900_audio->irq_num) {
ret = -EBUSY;
- goto out2;
+ goto out3;
}

nuc900_ac97_data = nuc900_audio;

2011-06-01 17:13:20

by Liam Girdwood

Subject: Re: [PATCH 2/10] sound/soc/nuc900/nuc900-ac97.c: add missing clk_put

On 01/06/11 18:10, Julia Lawall wrote:
> From: Julia Lawall <[email protected]>
>
> This goto is after the call to clk_get, so it should go to the label that
> includes a call to clk_put.
>
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @r exists@
> expression e1,e2;
> statement S;
> @@
>
> e1 = clk_get@p1(...);
> ... when != e1 = e2
> when != clk_put(e1)
> when any
> if (...) { ... when != clk_put(e1)
> when != if (...) { ... clk_put(e1) ... }
> * return@p3 ...;
> } else S
> // </smpl>
>
> Signed-off-by: Julia Lawall <[email protected]>
>
> ---
> sound/soc/nuc900/nuc900-ac97.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c
> index dac6732..9c0edad 100644
> --- a/sound/soc/nuc900/nuc900-ac97.c
> +++ b/sound/soc/nuc900/nuc900-ac97.c
> @@ -356,7 +356,7 @@ static int __devinit nuc900_ac97_drvprobe(struct platform_device *pdev)
> nuc900_audio->irq_num = platform_get_irq(pdev, 0);
> if (!nuc900_audio->irq_num) {
> ret = -EBUSY;
> - goto out2;
> + goto out3;
> }
>
> nuc900_ac97_data = nuc900_audio;
>

Acked-by: Liam Girdwood <[email protected]>

2011-06-01 18:21:18

by Mark Brown

Subject: Re: [PATCH 2/10] sound/soc/nuc900/nuc900-ac97.c: add missing clk_put

On Wed, Jun 01, 2011 at 07:10:05PM +0200, Julia Lawall wrote:
> From: Julia Lawall <[email protected]>
>
> This goto is after the call to clk_get, so it should go to the label that
> includes a call to clk_put.

Applied, thanks. Please do try to use subject lines for your patches
consistent with the code you're submitting against.