[PATCH v4 1/6] misc: sram: fix error path in sram_probe

Heiko Stübner heiko at sntech.de
Mon Jul 29 09:11:20 EDT 2013


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 at sntech.de>
Tested-by: Ulrich Prinz <ulrich.prinz at googlemail.com>
Acked-by: Philipp Zabel <p.zabel at pengutronix.de>
---
Only included for reference and completeness, as it is already
added to the char-misc git tree.

 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);
+		if (sram->clk)
+			clk_disable_unprepare(sram->clk);
 		return ret;
 	}
 
-- 
1.7.10.4




More information about the linux-arm-kernel mailing list