From 6e977c85f22b3a0c5aa2a80c479665de8014f230 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Wed, 8 Jun 2011 21:00:55 +0800 Subject: [PATCH] --- yaml --- r: 257916 b: refs/heads/master c: 2725ae17591bf771608fe62c54f7b2badcf7492f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/hw_random/nomadik-rng.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index df2c60c4a11c..38106a87b673 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ba1a31ef146f25a457968c00c8c10bbe1a3ccfe +refs/heads/master: 2725ae17591bf771608fe62c54f7b2badcf7492f diff --git a/trunk/drivers/char/hw_random/nomadik-rng.c b/trunk/drivers/char/hw_random/nomadik-rng.c index dd1d143eb8ea..52e08ca3ccd7 100644 --- a/trunk/drivers/char/hw_random/nomadik-rng.c +++ b/trunk/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) 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 @@ static int nmk_rng_probe(struct amba_device *dev, const struct amba_id *id) iounmap(base); out_release: amba_release_regions(dev); +out_clk: clk_disable(rng_clk); clk_put(rng_clk); return ret;