summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/msm/msm_drv.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-11-17 08:30:54 +0100
committerIngo Molnar <mingo@kernel.org>2016-11-17 08:30:54 +0100
commit89a01c51cbe3b6ae81008e8c91235be583df8c50 (patch)
tree0f2e42652d8ebdfc6aeaa8f7c1b5b834f4a5d649 /drivers/gpu/drm/msm/msm_drv.c
parentx86/dumpstack: Handle NULL stack pointer in show_trace_log_lvl() (diff)
parentx86/cpufeatures: Enable new AVX512 cpu features (diff)
downloadlinux-89a01c51cbe3b6ae81008e8c91235be583df8c50.tar.xz
linux-89a01c51cbe3b6ae81008e8c91235be583df8c50.zip
Merge branch 'x86/cpufeature' into x86/asm, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.c')
-rw-r--r--drivers/gpu/drm/msm/msm_drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index fb5c0b0a7594..46568fc80848 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -228,7 +228,7 @@ static int msm_drm_uninit(struct device *dev)
flush_workqueue(priv->atomic_wq);
destroy_workqueue(priv->atomic_wq);
- if (kms)
+ if (kms && kms->funcs)
kms->funcs->destroy(kms);
if (gpu) {