diff options
| author | Julia Lawall <julia@diku.dk> | 2011-06-01 19:48:50 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-02 00:10:01 -0700 |
| commit | 2e4ceec4edaef6e903422792de4f7f37de98cec6 (patch) | |
| tree | 628626d17ea26b1c77449afc9bdee88581982033 /drivers/net/can | |
| parent | 6979d5dd96a4a4975ce240982436e92a3da23315 (diff) | |
| download | op-kernel-dev-2e4ceec4edaef6e903422792de4f7f37de98cec6.zip op-kernel-dev-2e4ceec4edaef6e903422792de4f7f37de98cec6.tar.gz | |
drivers/net/can/flexcan.c: add missing clk_put
The failed_get label is used after the call to clk_get has succeeded, so it
should be moved up above the call to clk_put.
The failed_req labels doesn't do anything different than failed_get, so
delete it.
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 <julia@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/flexcan.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index d499056..1767811 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -923,7 +923,7 @@ static int __devinit flexcan_probe(struct platform_device *pdev) mem_size = resource_size(mem); if (!request_mem_region(mem->start, mem_size, pdev->name)) { err = -EBUSY; - goto failed_req; + goto failed_get; } base = ioremap(mem->start, mem_size); @@ -977,9 +977,8 @@ static int __devinit flexcan_probe(struct platform_device *pdev) iounmap(base); failed_map: release_mem_region(mem->start, mem_size); - failed_req: - clk_put(clk); failed_get: + clk_put(clk); failed_clock: return err; } |
