hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/etnaviv: check for errors when enabling clocks 

clk_prepare_enable() may fail, so we should better check for its return
value and propagate it in the case of failure.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
This commit is contained in:
Fabio Estevam 2016-08-21 19:32:13 -03:00 committed by Lucas Stach
parent d985349017
commit 9e59eea66f
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/gpu/drm/etnaviv/etnaviv_gpu.c
View File

@ -872,12 +872,25 @@ int etnaviv_gpu_debugfs(struct etnaviv_gpu *gpu, struct seq_file *m)
*/ */
static int enable_clk(struct etnaviv_gpu *gpu) static int enable_clk(struct etnaviv_gpu *gpu)
{ {
if (gpu->clk_core) int ret;
clk_prepare_enable(gpu->clk_core);
if (gpu->clk_shader) if (gpu->clk_core) {
clk_prepare_enable(gpu->clk_shader); ret = clk_prepare_enable(gpu->clk_core);
if (ret)
return ret;
}
if (gpu->clk_shader) {
ret = clk_prepare_enable(gpu->clk_shader);
if (ret)
goto disable_clk_core;
}
return 0; return 0;
disable_clk_core:
clk_disable_unprepare(gpu->clk_core);
return ret;
} }
static int disable_clk(struct etnaviv_gpu *gpu) static int disable_clk(struct etnaviv_gpu *gpu)
@ -892,8 +905,13 @@ static int disable_clk(struct etnaviv_gpu *gpu)
static int enable_axi(struct etnaviv_gpu *gpu) static int enable_axi(struct etnaviv_gpu *gpu)
{ {
if (gpu->clk_bus) int ret;
clk_prepare_enable(gpu->clk_bus);
if (gpu->clk_bus) {
ret = clk_prepare_enable(gpu->clk_bus);
if (ret)
return ret;
}
return 0; return 0;
} }