diff options
author | Heiko Stübner <heiko@sntech.de> | 2013-07-05 08:40:53 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-25 01:54:50 -0400 |
commit | 5f90b9b484938f7466e25cd5506e86ebf9dbcd17 (patch) | |
tree | 1d59d6b520b3dac565ebfd37837f5cacc72675d5 /drivers | |
parent | 78049a00ceeb1453cedcd109bb5487986ab46928 (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')
-rw-r--r-- | drivers/misc/sram.c | 3 |
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) | |||
68 | ret = gen_pool_add_virt(sram->pool, (unsigned long)virt_base, | 68 | ret = gen_pool_add_virt(sram->pool, (unsigned long)virt_base, |
69 | res->start, size, -1); | 69 | res->start, size, -1); |
70 | if (ret < 0) { | 70 | if (ret < 0) { |
71 | gen_pool_destroy(sram->pool); | 71 | if (sram->clk) |
72 | clk_disable_unprepare(sram->clk); | ||
72 | return ret; | 73 | return ret; |
73 | } | 74 | } |
74 | 75 | ||