Commit 9e59eea6 authored by Fabio Estevam's avatar Fabio Estevam Committed by Lucas Stach

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: default avatarFabio Estevam <festevam@gmail.com>
parent d9853490
...@@ -872,12 +872,25 @@ int etnaviv_gpu_debugfs(struct etnaviv_gpu *gpu, struct seq_file *m) ...@@ -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) ...@@ -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;
} }
......
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