diff options
author | Richard Zhao <rizhao@nvidia.com> | 2016-04-25 14:36:52 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-05-18 17:03:59 -0400 |
commit | 5ccaaa73af4683eabd4d135b5b08aec4a206b613 (patch) | |
tree | bf8119fd5d5fb86f8d5ecf58c79789d9796f34eb /drivers/gpu/nvgpu/vgpu | |
parent | abec0ddc19b89822138f3c8970516eed4d0e17d9 (diff) |
gpu: nvgpu: vgpu: fix Oops when dt have no mempool-fecs-trace
Avoid unreserving mempool when it didn't reserve successfully.
Bug 1757733
Change-Id: I39d36492a54c2e71afff3221505196a463c06776
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: http://git-master/r/1132057
(cherry picked from commit b18060ea30b924c4ef39c05a70d4f03759061128)
Reviewed-on: http://git-master/r/1132129
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c b/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c index 02e0baad..bd1a7451 100644 --- a/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c | |||
@@ -58,6 +58,7 @@ static int vgpu_fecs_trace_init(struct gk20a *g) | |||
58 | if (IS_ERR(vcst->cookie)) { | 58 | if (IS_ERR(vcst->cookie)) { |
59 | dev_info(dev_from_gk20a(g), | 59 | dev_info(dev_from_gk20a(g), |
60 | "mempool %u reserve failed\n", mempool); | 60 | "mempool %u reserve failed\n", mempool); |
61 | vcst->cookie = NULL; | ||
61 | err = -EINVAL; | 62 | err = -EINVAL; |
62 | goto fail; | 63 | goto fail; |
63 | } | 64 | } |
@@ -85,7 +86,7 @@ static int vgpu_fecs_trace_init(struct gk20a *g) | |||
85 | return 0; | 86 | return 0; |
86 | fail: | 87 | fail: |
87 | iounmap(vcst->buf); | 88 | iounmap(vcst->buf); |
88 | if (!IS_ERR(vcst->cookie)) | 89 | if (vcst->cookie) |
89 | tegra_hv_mempool_unreserve(vcst->cookie); | 90 | tegra_hv_mempool_unreserve(vcst->cookie); |
90 | kfree(vcst); | 91 | kfree(vcst); |
91 | return err; | 92 | return err; |