diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2015-11-04 16:25:09 +0300 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2015-11-04 12:29:21 -0500 |
| commit | 4cfdcd9cecc05646b08805ba449811a645b3f4a8 (patch) | |
| tree | 8671c0bb0272a75a644e8ae0b83dbe70d60778b2 /drivers/gpu | |
| parent | drm/amdgpu: update Fiji's Golden setting (diff) | |
| download | linux-dev-4cfdcd9cecc05646b08805ba449811a645b3f4a8.tar.xz linux-dev-4cfdcd9cecc05646b08805ba449811a645b3f4a8.zip | |
drm/amdgpu: cleanup on error in amdgpu_cs_ioctl()
We recently changed the locking in this function and now there is a
missing unlock on error. Also there are some other resources that we
should probably release as well...
Fixes: f48b2659f521 ('drm/amdgpu: fix the broken vm->mutex V2')
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 8727c3099554..233ac9c64eb3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -875,8 +875,10 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) struct amdgpu_job *job; struct amdgpu_ring * ring = parser->ibs->ring; job = kzalloc(sizeof(struct amdgpu_job), GFP_KERNEL); - if (!job) - return -ENOMEM; + if (!job) { + r = -ENOMEM; + goto out; + } job->base.sched = &ring->sched; job->base.s_entity = &parser->ctx->rings[ring->idx].entity; job->adev = parser->adev; |