Commit e0dc7c83 authored by Fabio Estevam's avatar Fabio Estevam Committed by Stefan Agner

drm/fsl-dcu: disable clock on error path

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: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
parent acd4d615
...@@ -270,7 +270,7 @@ static int fsl_dcu_drm_pm_resume(struct device *dev) ...@@ -270,7 +270,7 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
ret = clk_prepare_enable(fsl_dev->pix_clk); ret = clk_prepare_enable(fsl_dev->pix_clk);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "failed to enable pix clk\n"); dev_err(dev, "failed to enable pix clk\n");
return ret; goto disable_dcu_clk;
} }
fsl_dcu_drm_init_planes(fsl_dev->drm); fsl_dcu_drm_init_planes(fsl_dev->drm);
...@@ -284,6 +284,10 @@ static int fsl_dcu_drm_pm_resume(struct device *dev) ...@@ -284,6 +284,10 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
enable_irq(fsl_dev->irq); enable_irq(fsl_dev->irq);
return 0; return 0;
disable_dcu_clk:
clk_disable_unprepare(fsl_dev->clk);
return ret;
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment