summaryrefslogtreecommitdiff
path: root/drivers/misc/sram.c
diff options
context:
space:
mode:
authorHeiko Stübner <heiko@sntech.de>2013-07-05 14:40:53 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-24 22:54:50 -0700
commit5f90b9b484938f7466e25cd5506e86ebf9dbcd17 (patch)
tree1d59d6b520b3dac565ebfd37837f5cacc72675d5 /drivers/misc/sram.c
parent78049a00ceeb1453cedcd109bb5487986ab46928 (diff)
misc: sram: fix error path in sram_probe
The pool is created thru devm_gen_pool_create, so the call to gen_pool_destroy is not necessary. Instead the sram-clock must be turned off again if it exists. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Ulrich Prinz <ulrich.prinz@googlemail.com> Acked-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/sram.c')
-rw-r--r--drivers/misc/sram.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/misc/sram.c b/drivers/misc/sram.c
index d87cc91bc016..afe66571ce0b 100644
--- a/drivers/misc/sram.c
+++ b/drivers/misc/sram.c
@@ -68,7 +68,8 @@ static int sram_probe(struct platform_device *pdev)
ret = gen_pool_add_virt(sram->pool, (unsigned long)virt_base,
res->start, size, -1);
if (ret < 0) {
- gen_pool_destroy(sram->pool);
+ if (sram->clk)
+ clk_disable_unprepare(sram->clk);
return ret;
}