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

2013-07-05 Thread Heiko Stübner
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 
Tested-by: Ulrich Prinz 
---
 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

___
devicetree-discuss mailing list
devicetree-discuss@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss


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

2013-07-05 Thread Philipp Zabel
Am Freitag, den 05.07.2013, 14:40 +0200 schrieb Heiko Stübner:
> 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 
> Tested-by: Ulrich Prinz 

Acked-by: Philipp Zabel 

> ---
>  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;
>   }
>  

regards
Philipp

___
devicetree-discuss mailing list
devicetree-discuss@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss