diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-06-11 11:25:50 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-11 11:25:50 +0200 |
| commit | 50c0587eedc15235144216f2d2a5bd2a85e03289 (patch) | |
| tree | 74f24e52bba71efea51dc8ada3ac5427aa1627e5 /drivers/gpu/drm/msm/adreno | |
| parent | 3b290398638ee4e57f1fb2e35c02005cba9a737f (diff) | |
| parent | 75d089d12a66a8662d888ff60a9eaea230fed53e (diff) | |
Merge branch 'linus' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/msm/adreno')
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index fbe304ee6c80..2aec27dbb5bb 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -408,7 +408,7 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, } adreno_gpu->memptrs = msm_gem_vaddr(adreno_gpu->memptrs_bo); - if (!adreno_gpu->memptrs) { + if (IS_ERR(adreno_gpu->memptrs)) { dev_err(drm->dev, "could not vmap memptrs\n"); return -ENOMEM; } |