]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
hwrng: nomadik - add missing clk_put
authorJulia Lawall <julia@diku.dk>
Wed, 8 Jun 2011 13:00:55 +0000 (21:00 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Wed, 29 Jun 2011 23:44:01 +0000 (07:44 +0800)
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>
drivers/char/hw_random/nomadik-rng.c

index dd1d143eb8eae2f284444d91a6ddac1e6371a41c..52e08ca3ccd794b87f0276008df0f56c564ef440 100644 (file)
@@ -55,7 +55,7 @@ static int nmk_rng_probe(struct amba_device *dev, const struct amba_id *id)
 
        ret = amba_request_regions(dev, dev->dev.init_name);
        if (ret)
-               return ret;
+               goto out_clk;
        ret = -ENOMEM;
        base = ioremap(dev->res.start, resource_size(&dev->res));
        if (!base)
@@ -70,6 +70,7 @@ out_unmap:
        iounmap(base);
 out_release:
        amba_release_regions(dev);
+out_clk:
        clk_disable(rng_clk);
        clk_put(rng_clk);
        return ret;