commit 424d2cd903c1f60b88ddb2c306ffcfe640b4eb58
author Linux Build Service Account <lnxbuild@localhost> Sun May 27 01:45:10 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Sun May 27 01:45:10 2012 -0700
tree 9baa3e354b85155482d83c9c41f2b37feea599f8
parent 873744940a675f326e93eeab6382d8cdeb3688e2
parent 4d89c2ec0041f565255934c5db53bc2f55821862

Merge "msm: pil-q6v5-lpass: Add missing proxy timeout value" into msm-3.0

arch/arm/mach-msm/pil-q6v5-lpass.c

diff --git a/arch/arm/mach-msm/pil-q6v5-lpass.c b/arch/arm/mach-msm/pil-q6v5-lpass.c
index e5e176b..311f8a7 100644
--- a/arch/arm/mach-msm/pil-q6v5-lpass.c
+++ b/arch/arm/mach-msm/pil-q6v5-lpass.c
@@ -23,6 +23,7 @@
 #include "pil-q6v5.h"
 
 #define QDSP6SS_RST_EVB			0x010
+#define PROXY_TIMEOUT_MS		10000
 
 static int pil_lpass_shutdown(struct pil_desc *pil)
 {
@@ -93,6 +94,7 @@
 
 	desc->ops = &pil_lpass_ops;
 	desc->owner = THIS_MODULE;
+	desc->proxy_timeout = PROXY_TIMEOUT_MS;
 
 	drv->pil = msm_pil_register(desc);
 	if (IS_ERR(drv->pil))