commit 16ff41ab54ce50a32d98728314b978e7c8ff130c
author Linux Build Service Account <lnxbuild@localhost> Sun Mar 16 02:17:15 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Mar 16 02:17:14 2014 -0700
tree b898657f93e117c29c46c21576b545d7ff1ac2e4
parent d5ecf10f1a591129482e246c1029d2f58d65abc5
parent 37207ed0a9cc87e0fbe1942b518ceed3c350b0b0

Merge "msm: kgsl: Protect fault detect start with active count"

drivers/gpu/msm/adreno.c

diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index 7a92fe6..0ec8f52 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -2423,9 +2423,12 @@
 
 	if (tmp != adreno_dev->fast_hang_detect) {
 		if (adreno_dev->fast_hang_detect) {
-			if (adreno_dev->gpudev->fault_detect_start)
+			if (adreno_dev->gpudev->fault_detect_start &&
+				!kgsl_active_count_get(&adreno_dev->dev)) {
 				adreno_dev->gpudev->fault_detect_start(
 					adreno_dev);
+				kgsl_active_count_put(&adreno_dev->dev);
+			}
 		} else {
 			if (adreno_dev->gpudev->fault_detect_stop)
 				adreno_dev->gpudev->fault_detect_stop(