* [PATCH -next] gpu: host1x: add missing clk_disable_unprepare() on error in host1x_probe()
@ 2013-10-21 5:37 Wei Yongjun
[not found] ` <CAPgLHd_Tw1Os0mT1NgcipJ+fhhbsS+s-Ba-tksUXqFV2cY_ZjQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Wei Yongjun @ 2013-10-21 5:37 UTC (permalink / raw)
To: thierry.reding-Re5JQEeQqe8AvxtiuMwx3w,
tbergstrom-DDmLM1+adcrQT0dZR+AlfA,
grant.likely-QSEj5FYQhm4dnm+yROfE0A,
rob.herring-bsGFqQB8/DxBDgjK7y7TUQ
Cc: yongjun_wei-zrsr2BFq86L20UzCJQGyNP8+0UxHXcjY,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
From: Wei Yongjun <yongjun_wei-zrsr2BFq86L20UzCJQGyNP8+0UxHXcjY@public.gmane.org>
Add the missing clk_disable_unprepare() before return
from host1x_probe() in the error handling case.
Signed-off-by: Wei Yongjun <yongjun_wei-zrsr2BFq86L20UzCJQGyNP8+0UxHXcjY@public.gmane.org>
---
drivers/gpu/host1x/dev.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
index 12d6333..646a333 100644
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -154,7 +154,7 @@ static int host1x_probe(struct platform_device *pdev)
err = host1x_syncpt_init(host);
if (err) {
dev_err(&pdev->dev, "failed to initialize syncpts\n");
- return err;
+ goto fail_unprepare_disable;
}
err = host1x_intr_init(host, syncpt_irq);
@@ -175,6 +175,8 @@ fail_deinit_intr:
host1x_intr_deinit(host);
fail_deinit_syncpt:
host1x_syncpt_deinit(host);
+fail_unprepare_disable:
+ clk_disable_unprepare(host->clk);
return err;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH -next] gpu: host1x: add missing clk_disable_unprepare() on error in host1x_probe()
[not found] ` <CAPgLHd_Tw1Os0mT1NgcipJ+fhhbsS+s-Ba-tksUXqFV2cY_ZjQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2013-10-28 8:24 ` Terje Bergström
2013-10-28 8:52 ` Thierry Reding
1 sibling, 0 replies; 3+ messages in thread
From: Terje Bergström @ 2013-10-28 8:24 UTC (permalink / raw)
To: Wei Yongjun,
thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org,
rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org
Cc: yongjun_wei-zrsr2BFq86L20UzCJQGyNP8+0UxHXcjY@public.gmane.org,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
On 21.10.2013 08:37, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei-zrsr2BFq86L20UzCJQGyNP8+0UxHXcjY@public.gmane.org>
>
> Add the missing clk_disable_unprepare() before return
> from host1x_probe() in the error handling case.
>
> Signed-off-by: Wei Yongjun <yongjun_wei-zrsr2BFq86L20UzCJQGyNP8+0UxHXcjY@public.gmane.org>
> ---
> drivers/gpu/host1x/dev.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
> index 12d6333..646a333 100644
> --- a/drivers/gpu/host1x/dev.c
> +++ b/drivers/gpu/host1x/dev.c
> @@ -154,7 +154,7 @@ static int host1x_probe(struct platform_device *pdev)
> err = host1x_syncpt_init(host);
> if (err) {
> dev_err(&pdev->dev, "failed to initialize syncpts\n");
> - return err;
> + goto fail_unprepare_disable;
> }
>
> err = host1x_intr_init(host, syncpt_irq);
> @@ -175,6 +175,8 @@ fail_deinit_intr:
> host1x_intr_deinit(host);
> fail_deinit_syncpt:
> host1x_syncpt_deinit(host);
> +fail_unprepare_disable:
> + clk_disable_unprepare(host->clk);
> return err;
> }
Looks good.
Reviewed-by: Terje Bergstrom <tbergstrom-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Terje
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH -next] gpu: host1x: add missing clk_disable_unprepare() on error in host1x_probe()
[not found] ` <CAPgLHd_Tw1Os0mT1NgcipJ+fhhbsS+s-Ba-tksUXqFV2cY_ZjQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-10-28 8:24 ` Terje Bergström
@ 2013-10-28 8:52 ` Thierry Reding
1 sibling, 0 replies; 3+ messages in thread
From: Thierry Reding @ 2013-10-28 8:52 UTC (permalink / raw)
To: Wei Yongjun
Cc: tbergstrom-DDmLM1+adcrQT0dZR+AlfA,
grant.likely-QSEj5FYQhm4dnm+yROfE0A,
rob.herring-bsGFqQB8/DxBDgjK7y7TUQ,
yongjun_wei-zrsr2BFq86L20UzCJQGyNP8+0UxHXcjY,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
On Mon, Oct 21, 2013 at 01:37:31PM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei-zrsr2BFq86L20UzCJQGyNP8+0UxHXcjY@public.gmane.org>
>
> Add the missing clk_disable_unprepare() before return
> from host1x_probe() in the error handling case.
>
> Signed-off-by: Wei Yongjun <yongjun_wei-zrsr2BFq86L20UzCJQGyNP8+0UxHXcjY@public.gmane.org>
> ---
> drivers/gpu/host1x/dev.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
Applied, thanks.
Thierry
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-10-28 8:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-21 5:37 [PATCH -next] gpu: host1x: add missing clk_disable_unprepare() on error in host1x_probe() Wei Yongjun
[not found] ` <CAPgLHd_Tw1Os0mT1NgcipJ+fhhbsS+s-Ba-tksUXqFV2cY_ZjQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-10-28 8:24 ` Terje Bergström
2013-10-28 8:52 ` Thierry Reding
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox