diff options
author | Julia Lawall <julia@diku.dk> | 2011-06-08 09:00:55 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2011-06-29 19:44:01 -0400 |
commit | 2725ae17591bf771608fe62c54f7b2badcf7492f (patch) | |
tree | fe3a1d7b446b229c0179ab381ecc69a92953d4b8 /drivers/char | |
parent | 6ba1a31ef146f25a457968c00c8c10bbe1a3ccfe (diff) |
hwrng: nomadik - add missing clk_put
Jump to the end of the function for the clk_disable and clk_put rather than
returning directly.
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: Matt Mackall <mpm@selenic.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/hw_random/nomadik-rng.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/hw_random/nomadik-rng.c b/drivers/char/hw_random/nomadik-rng.c index dd1d143eb8ea..52e08ca3ccd7 100644 --- a/drivers/char/hw_random/nomadik-rng.c +++ b/drivers/char/hw_random/nomadik-rng.c | |||
@@ -55,7 +55,7 @@ static int nmk_rng_probe(struct amba_device *dev, const struct amba_id *id) | |||
55 | 55 | ||
56 | ret = amba_request_regions(dev, dev->dev.init_name); | 56 | ret = amba_request_regions(dev, dev->dev.init_name); |
57 | if (ret) | 57 | if (ret) |
58 | return ret; | 58 | goto out_clk; |
59 | ret = -ENOMEM; | 59 | ret = -ENOMEM; |
60 | base = ioremap(dev->res.start, resource_size(&dev->res)); | 60 | base = ioremap(dev->res.start, resource_size(&dev->res)); |
61 | if (!base) | 61 | if (!base) |
@@ -70,6 +70,7 @@ out_unmap: | |||
70 | iounmap(base); | 70 | iounmap(base); |
71 | out_release: | 71 | out_release: |
72 | amba_release_regions(dev); | 72 | amba_release_regions(dev); |
73 | out_clk: | ||
73 | clk_disable(rng_clk); | 74 | clk_disable(rng_clk); |
74 | clk_put(rng_clk); | 75 | clk_put(rng_clk); |
75 | return ret; | 76 | return ret; |