commit f0039de70dfc4a24ffea582ab455d39e583cd766
author Linux Build Service Account <lnxbuild@localhost> Fri May 17 04:09:23 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri May 17 04:09:21 2013 -0700
tree 0e7ce0cd40649f2a21e977e61e859985b3511450
parent 1c2d131a37ec803af2134443212a3138e0f17054
parent 6222f39a2d3a26658f616dcd4b8bce9c0b786fbd

Merge "msm: subsystem_restart: Bypass error ready wait for debugging"

arch/arm/mach-msm/subsystem_restart.c

diff --git a/arch/arm/mach-msm/subsystem_restart.c b/arch/arm/mach-msm/subsystem_restart.c
index c971896..b956649 100644
--- a/arch/arm/mach-msm/subsystem_restart.c
+++ b/arch/arm/mach-msm/subsystem_restart.c
@@ -41,6 +41,9 @@
 
 #include "smd_private.h"
 
+static int enable_debug;
+module_param(enable_debug, int, S_IRUGO | S_IWUSR);
+
 /**
  * enum p_subsys_state - state of a subsystem (private)
  * @SUBSYS_NORMAL: subsystem is operating normally
@@ -419,7 +422,7 @@
 {
 	int ret;
 
-	if (!subsys->desc->err_ready_irq)
+	if (!subsys->desc->err_ready_irq || enable_debug == 1)
 		return 0;
 
 	ret = wait_for_completion_timeout(&subsys->err_ready,