Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2725ae17 authored by Julia Lawall's avatar Julia Lawall Committed by Herbert Xu
Browse files

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: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarMatt Mackall <mpm@selenic.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6ba1a31e

drivers/char/hw_random/nomadik-rng.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -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);

	ret = amba_request_regions(dev, dev->dev.init_name);

	if (ret)

	if (ret)

		return ret;

		goto out_clk;

	ret = -ENOMEM;

	ret = -ENOMEM;

	base = ioremap(dev->res.start, resource_size(&dev->res));

	base = ioremap(dev->res.start, resource_size(&dev->res));

	if (!base)

	if (!base)
@@ -70,6 +70,7 @@ static int nmk_rng_probe(struct amba_device *dev, const struct amba_id *id) 
	iounmap(base);

	iounmap(base);

out_release:

out_release:

	amba_release_regions(dev);

	amba_release_regions(dev);

out_clk:

	clk_disable(rng_clk);

	clk_disable(rng_clk);

	clk_put(rng_clk);

	clk_put(rng_clk);

	return ret;

	return ret;