2011-06-01 17:11:35

by Julia Lawall

Subject: [PATCH 7/10] drivers/net/davinci_emac.c: add missing clk_put

From: Julia Lawall <[email protected]>

Go to existing error handling code at the end of the function that calls
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]>

---
drivers/net/davinci_emac.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 29a4f06..dcc4a17 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -1781,8 +1781,8 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
ndev = alloc_etherdev(sizeof(struct emac_priv));
if (!ndev) {
dev_err(&pdev->dev, "error allocating net_device\n");
- clk_put(emac_clk);
- return -ENOMEM;
+ rc = -ENOMEM;
+ goto free_clk;
}

platform_set_drvdata(pdev, ndev);
@@ -1796,7 +1796,8 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
pdata = pdev->dev.platform_data;
if (!pdata) {
dev_err(&pdev->dev, "no platform data\n");
- return -ENODEV;
+ rc = -ENODEV;
+ goto probe_quit;
}

/* MAC addr and PHY mask , RMII enable info from platform_data */
@@ -1929,8 +1930,9 @@ no_dma:
iounmap(priv->remap_addr);

probe_quit:
- clk_put(emac_clk);
free_netdev(ndev);
+free_clk:
+ clk_put(emac_clk);
return rc;
}

2011-06-01 19:49:33

by Kevin Hilman

Subject: Re: [PATCH 7/10] drivers/net/davinci_emac.c: add missing clk_put

On Wed, 2011-06-01 at 19:10 +0200, Julia Lawall wrote:
> From: Julia Lawall <[email protected]>
>
> Go to existing error handling code at the end of the function that calls
> 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]>

Acked-by: Kevin Hilman <[email protected]>

2011-06-02 04:20:49

by David Miller

Subject: Re: [PATCH 7/10] drivers/net/davinci_emac.c: add missing clk_put

From: Kevin Hilman <[email protected]>
Date: Wed, 01 Jun 2011 12:49:24 -0700

> On Wed, 2011-06-01 at 19:10 +0200, Julia Lawall wrote:
>> From: Julia Lawall <[email protected]>
>>
>> Go to existing error handling code at the end of the function that calls
>> 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]>
>
> Acked-by: Kevin Hilman <[email protected]>

Applied, thanks.