diff options
Diffstat (limited to 'drivers/gpu/nvgpu/boardobj/boardobj.c')
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobj.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.c b/drivers/gpu/nvgpu/boardobj/boardobj.c index f38c7c4a..5f726935 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobj.c +++ b/drivers/gpu/nvgpu/boardobj/boardobj.c | |||
@@ -34,13 +34,15 @@ u32 boardobj_construct_super(struct gk20a *g, struct boardobj **ppboardobj, | |||
34 | 34 | ||
35 | nvgpu_log_info(g, " "); | 35 | nvgpu_log_info(g, " "); |
36 | 36 | ||
37 | if (devtmp == NULL) | 37 | if (devtmp == NULL) { |
38 | return -EINVAL; | 38 | return -EINVAL; |
39 | } | ||
39 | 40 | ||
40 | if (*ppboardobj == NULL) { | 41 | if (*ppboardobj == NULL) { |
41 | *ppboardobj = nvgpu_kzalloc(g, size); | 42 | *ppboardobj = nvgpu_kzalloc(g, size); |
42 | if (*ppboardobj == NULL) | 43 | if (*ppboardobj == NULL) { |
43 | return -ENOMEM; | 44 | return -ENOMEM; |
45 | } | ||
44 | (*ppboardobj)->allocated = true; | 46 | (*ppboardobj)->allocated = true; |
45 | } | 47 | } |
46 | 48 | ||
@@ -64,12 +66,14 @@ u32 boardobj_destruct_super(struct boardobj *pboardobj) | |||
64 | struct gk20a *g = pboardobj->g; | 66 | struct gk20a *g = pboardobj->g; |
65 | 67 | ||
66 | nvgpu_log_info(g, " "); | 68 | nvgpu_log_info(g, " "); |
67 | if (pboardobj == NULL) | 69 | if (pboardobj == NULL) { |
68 | return -EINVAL; | 70 | return -EINVAL; |
71 | } | ||
69 | 72 | ||
70 | nvgpu_list_del(&pboardobj->node); | 73 | nvgpu_list_del(&pboardobj->node); |
71 | if (pboardobj->allocated) | 74 | if (pboardobj->allocated) { |
72 | nvgpu_kfree(pboardobj->g, pboardobj); | 75 | nvgpu_kfree(pboardobj->g, pboardobj); |
76 | } | ||
73 | 77 | ||
74 | return 0; | 78 | return 0; |
75 | } | 79 | } |
@@ -86,10 +90,12 @@ u32 boardobj_pmudatainit_super(struct gk20a *g, struct boardobj *pboardobj, | |||
86 | struct nv_pmu_boardobj *pmudata) | 90 | struct nv_pmu_boardobj *pmudata) |
87 | { | 91 | { |
88 | nvgpu_log_info(g, " "); | 92 | nvgpu_log_info(g, " "); |
89 | if (pboardobj == NULL) | 93 | if (pboardobj == NULL) { |
90 | return -EINVAL; | 94 | return -EINVAL; |
91 | if (pmudata == NULL) | 95 | } |
96 | if (pmudata == NULL) { | ||
92 | return -EINVAL; | 97 | return -EINVAL; |
98 | } | ||
93 | pmudata->type = pboardobj->type; | 99 | pmudata->type = pboardobj->type; |
94 | nvgpu_log_info(g, " Done"); | 100 | nvgpu_log_info(g, " Done"); |
95 | return 0; | 101 | return 0; |