* [PATCH] drm/fsl-dcu: disable clock on error path
@ 2016-08-22 2:22 Fabio Estevam
2016-09-05 19:30 ` Stefan Agner
0 siblings, 1 reply; 2+ messages in thread
From: Fabio Estevam @ 2016-08-22 2:22 UTC (permalink / raw)
To: stefan; +Cc: Fabio Estevam, dri-devel
From: Fabio Estevam <fabio.estevam@nxp.com>
In fsl_dcu_drm_pm_resume() we should disable the previously enabled
clock (fsl_dev->clk) when enabling fsl_dev->pix_clk fails.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
index 7882387..76ae558 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
@@ -270,7 +270,7 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
ret = clk_prepare_enable(fsl_dev->pix_clk);
if (ret < 0) {
dev_err(dev, "failed to enable pix clk\n");
- return ret;
+ goto disable_dcu_clk;
}
fsl_dcu_drm_init_planes(fsl_dev->drm);
@@ -284,6 +284,10 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
enable_irq(fsl_dev->irq);
return 0;
+
+disable_dcu_clk:
+ clk_disable_unprepare(fsl_dev->clk);
+ return ret;
}
#endif
--
1.9.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/fsl-dcu: disable clock on error path
2016-08-22 2:22 [PATCH] drm/fsl-dcu: disable clock on error path Fabio Estevam
@ 2016-09-05 19:30 ` Stefan Agner
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Agner @ 2016-09-05 19:30 UTC (permalink / raw)
To: Fabio Estevam; +Cc: Fabio Estevam, dri-devel
On 2016-08-21 19:22, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
>
> In fsl_dcu_drm_pm_resume() we should disable the previously enabled
> clock (fsl_dev->clk) when enabling fsl_dev->pix_clk fails.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Applied, thanks!
--
Stefan
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-05 19:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-22 2:22 [PATCH] drm/fsl-dcu: disable clock on error path Fabio Estevam
2016-09-05 19:30 ` Stefan Agner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).