diff options
author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-26 14:09:09 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-26 14:09:09 -0700 |
commit | 881828b004c3c4411ee152ac1b2dbae96ae0f391 (patch) | |
tree | 2849c11faa788b624957a2076be37746be805de8 | |
parent | 33a94f46e5ab4eb83334bdf69bfc17155b49da7e (diff) | |
parent | 5ea16d78cc2c9b9deb4a29804f9ccec0839a8b9f (diff) |
Merge "msm: kgsl: Deal with a NULL pointer when creating default pagetable"
-rw-r--r-- | drivers/gpu/msm/kgsl_iommu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/msm/kgsl_iommu.c b/drivers/gpu/msm/kgsl_iommu.c index af9fc1c15236..57d99c451952 100644 --- a/drivers/gpu/msm/kgsl_iommu.c +++ b/drivers/gpu/msm/kgsl_iommu.c @@ -1547,6 +1547,8 @@ static int _setup_user_context(struct kgsl_mmu *mmu) ret = PTR_ERR(mmu->defaultpagetable); mmu->defaultpagetable = NULL; return ret; + } else if (mmu->defaultpagetable == NULL) { + return -ENOMEM; } } |