Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2725ae17591bf771608fe62c54f7b2badcf7492f

Authored by Julia Lawall
Committed by Herbert Xu
1 parent 6ba1a31ef1
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

drivers/char/hw_random/nomadik-rng.c
Diff comments   View file @ 2725ae1
... ... @@ -55,7 +55,7 @@
55 55  
56 56 ret = amba_request_regions(dev, dev->dev.init_name);
57 57 if (ret)
58   - return ret;
  58 + goto out_clk;
59 59 ret = -ENOMEM;
60 60 base = ioremap(dev->res.start, resource_size(&dev->res));
61 61 if (!base)
... ... @@ -70,6 +70,7 @@
70 70 iounmap(base);
71 71 out_release:
72 72 amba_release_regions(dev);
  73 +out_clk:
73 74 clk_disable(rng_clk);
74 75 clk_put(rng_clk);
75 76 return ret;