commit 9d8e0b98bfdf1e6869976a192fadf88eb5e67f56
author Linux Build Service Account <lnxbuild@localhost> Tue Nov 05 22:32:11 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Nov 05 22:32:11 2013 -0800
tree df8f21c554c6b33a5cfd02906285fa9d11d808ac
parent 66c00be2b87780fa57ec107e8ba016d2085f54a2
parent 4678994b2206bf3085dbe2656260ef931f94d3a8

Merge "msm: kgsl: Switch to default pagetables in case of NULL context"

drivers/gpu/msm/adreno.c

diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index 4ef0d94..b0e3281 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -948,8 +948,10 @@
 	num_iommu_units = kgsl_mmu_get_num_iommu_units(&device->mmu);
 
 	context = kgsl_context_get(device, context_id);
-	if (context == NULL)
+	if (context == NULL) {
+		kgsl_mmu_device_setstate(&device->mmu, KGSL_CONTEXT_INVALID);
 		return -EINVAL;
+	}
 
 	adreno_ctx = ADRENO_CONTEXT(context);