projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9e46215
)
drm/msm: fix error path cleanup
author
Rob Clark
<robdclark@gmail.com>
Thu, 24 Aug 2017 18:24:29 +0000
(14:24 -0400)
committer
Rob Clark
<robdclark@gmail.com>
Thu, 12 Oct 2017 18:19:08 +0000
(14:19 -0400)
If we fail to attach iommu, gpu->aspace could be IS_ERR()..
Signed-off-by: Rob Clark <robdclark@gmail.com>
drivers/gpu/drm/msm/msm_gpu.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/msm/msm_gpu.c
b/drivers/gpu/drm/msm/msm_gpu.c
index ffbff27600e0ff620fe623172e30783f53ce5fe7..6a887032c66ae08ea5354599b997640c7b005ac5 100644
(file)
--- 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)
msm_gem_put_iova(gpu->rb->bo, gpu->aspace);
msm_ringbuffer_destroy(gpu->rb);
}
- if (gpu->aspace) {
+
+ if (!IS_ERR_OR_NULL(gpu->aspace)) {
gpu->aspace->mmu->funcs->detach(gpu->aspace->mmu,
NULL, 0);
msm_gem_address_space_put(gpu->aspace);