diff options
author | Rob Clark <robdclark@gmail.com> | 2017-08-24 14:24:29 -0400 |
---|---|---|
committer | Rob Clark <robdclark@gmail.com> | 2017-10-12 14:19:08 -0400 |
commit | 6bd6ae2dfc7e091059fd8a650579bb1efc9b4b9f (patch) | |
tree | c95e757facdf8fcbf0a3630b0cf12158b8dacec8 | |
parent | 9e4621531e2af230611c28c67306a31e1a09f76a (diff) |
drm/msm: fix error path cleanup
If we fail to attach iommu, gpu->aspace could be IS_ERR()..
Signed-off-by: Rob Clark <robdclark@gmail.com>
-rw-r--r-- | drivers/gpu/drm/msm/msm_gpu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index ffbff27600e0..6a887032c66a 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c | |||
@@ -718,7 +718,8 @@ void msm_gpu_cleanup(struct msm_gpu *gpu) | |||
718 | msm_gem_put_iova(gpu->rb->bo, gpu->aspace); | 718 | msm_gem_put_iova(gpu->rb->bo, gpu->aspace); |
719 | msm_ringbuffer_destroy(gpu->rb); | 719 | msm_ringbuffer_destroy(gpu->rb); |
720 | } | 720 | } |
721 | if (gpu->aspace) { | 721 | |
722 | if (!IS_ERR_OR_NULL(gpu->aspace)) { | ||
722 | gpu->aspace->mmu->funcs->detach(gpu->aspace->mmu, | 723 | gpu->aspace->mmu->funcs->detach(gpu->aspace->mmu, |
723 | NULL, 0); | 724 | NULL, 0); |
724 | msm_gem_address_space_put(gpu->aspace); | 725 | msm_gem_address_space_put(gpu->aspace); |