[PATCH v2 1/6] misc: sram: fix error path in sram_probe
From: p.zabel@pengutronix.de (Philipp Zabel)
Date: 2013-06-25 09:05:17
Also in:
linux-devicetree, lkml
Hi Heiko, Am Dienstag, den 25.06.2013, 10:46 +0200 schrieb Heiko St?bner:
quoted hunk ↗ jump to hunk
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> --- drivers/misc/sram.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)diff --git a/drivers/misc/sram.c b/drivers/misc/sram.c index d87cc91..afe66571 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);
Right, thanks.
+ if (sram->clk) + clk_disable_unprepare(sram->clk); return ret; }
In light of the following patch, I'd rather move the clk_prepare_enable() call after gen_pool_add_virt() and its error path. regards Philipp