From 1ca4c5f069f8b055248aab61619c9a2490b1fe9c Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Wed, 29 Mar 2017 14:28:15 +0530 Subject: gpu: nvgpu: check return value of mutex_init in clk code - check return value of nvgpu_mutex_init in clk_gk20a.c/clk_gm20b.c/clk_gp106.c - add corresponding nvgpu_mutex_destroy calls Jira NVGPU-13 Change-Id: If6ddc2c924e1ab13274b857f904859033722479a Signed-off-by: Deepak Nibade Reviewed-on: http://git-master/r/1321293 Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gp106/clk_gp106.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gp106') diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c index 8869c94b..8bc47ead 100644 --- a/drivers/gpu/nvgpu/gp106/clk_gp106.c +++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c @@ -78,18 +78,23 @@ static int gp106_init_clk_support(struct gk20a *g) { gk20a_dbg_fn(""); - nvgpu_mutex_init(&clk->clk_mutex); + err = nvgpu_mutex_init(&clk->clk_mutex); + if (err) + return err; clk->clk_namemap = (struct namemap_cfg *) nvgpu_kzalloc(g, sizeof(struct namemap_cfg) * NUM_NAMEMAPS); - if (!clk->clk_namemap) + if (!clk->clk_namemap) { + nvgpu_mutex_destroy(&clk->clk_mutex); return -ENOMEM; + } clk->namemap_xlat_table = nvgpu_kcalloc(g, NUM_NAMEMAPS, sizeof(u32)); if (!clk->namemap_xlat_table) { nvgpu_kfree(g, clk->clk_namemap); + nvgpu_mutex_destroy(&clk->clk_mutex); return -ENOMEM; } @@ -265,8 +270,15 @@ err_out: } #endif /* CONFIG_DEBUG_FS */ +static int gp106_suspend_clk_support(struct gk20a *g) +{ + nvgpu_mutex_destroy(&g->clk.clk_mutex); + return 0; +} + void gp106_init_clk_ops(struct gpu_ops *gops) { gops->clk.init_clk_support = gp106_init_clk_support; gops->clk.get_crystal_clk_hz = gp106_crystal_clk_hz; gops->clk.measure_freq = gp106_clk_measure_freq; + gops->clk.suspend_clk_support = gp106_suspend_clk_support; } -- cgit v1.2.2