openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Stefan Agner <stefan@agner.ch>
This commit is contained in:
Fabio Estevam 2016-08-21 23:22:54 -03:00 committed by Stefan Agner
parent acd4d615bc
commit e0dc7c837d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
View File

@ -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)
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