diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2016-07-16 02:39:22 -0400 |
---|---|---|
committer | Vijayakumar Subbu <vsubbu@nvidia.com> | 2016-07-18 03:43:19 -0400 |
commit | 55b298d05a7dd32e5af92d47dab52010f7cfd7a3 (patch) | |
tree | 965e0fff77ad5a945480351e135d3a00a620defa /drivers/gpu | |
parent | b14b2e34009dfa98116f9e37a572b506fc59f06a (diff) |
gpu: nvgpu: use nvgpu_free for gpfifo pipe cleanup on error
Replace kfree with nvgpu_free in error handling path in
gk20a_alloc_channel_gpfifo where the gpfifo pipe buffer is being
allocated, because it's allocated with nvgpu_alloc.
Jira DNVGPU-21
Change-Id: I73100394b67da2ab064e4e9df6b430d818abce56
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/1182401
GVS: Gerrit_Virtual_Submit
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index 1439410e..e631b836 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -1511,7 +1511,7 @@ int gk20a_alloc_channel_gpfifo(struct channel_gk20a *c, | |||
1511 | return 0; | 1511 | return 0; |
1512 | 1512 | ||
1513 | clean_up_unmap: | 1513 | clean_up_unmap: |
1514 | kfree(c->gpfifo.pipe); | 1514 | nvgpu_free(c->gpfifo.pipe); |
1515 | gk20a_gmmu_unmap_free(ch_vm, &c->gpfifo.mem); | 1515 | gk20a_gmmu_unmap_free(ch_vm, &c->gpfifo.mem); |
1516 | clean_up: | 1516 | clean_up: |
1517 | memset(&c->gpfifo, 0, sizeof(struct gpfifo_desc)); | 1517 | memset(&c->gpfifo, 0, sizeof(struct gpfifo_desc)); |