commit ea11eaa9f85370ac251d6edcd17bf37a098bf46c
author Linux Build Service Account <lnxbuild@localhost> Sun Jul 07 23:09:17 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Jul 07 23:09:16 2019 -0700
tree 1d239b3a6a0c5d39a66735d32dc73077279035c0
parent 3b41576aed6b21e8087a9f6160e667127fa1f211
parent 3b85e99591ac231123191d6a8ab89e5c14dcfeb8

Merge "icnss: Reduce the shutdown timeout from 50sec to 15sec"

drivers/soc/qcom/icnss.c

diff --git a/drivers/soc/qcom/icnss.c b/drivers/soc/qcom/icnss.c
index ac36b27..a2cbfd8 100644
--- a/drivers/soc/qcom/icnss.c
+++ b/drivers/soc/qcom/icnss.c
@@ -77,7 +77,7 @@
 
 #define ICNSS_MAX_PROBE_CNT		2
 
-#define PROBE_TIMEOUT			5000
+#define PROBE_TIMEOUT			15000
 
 #define icnss_ipc_log_string(_x...) do {				\
 	if (icnss_ipc_log_context)					\
@@ -2864,8 +2864,8 @@
 	if (code == SUBSYS_BEFORE_SHUTDOWN && !notif->crashed &&
 	    test_bit(ICNSS_BLOCK_SHUTDOWN, &priv->state)) {
 		if (!wait_for_completion_timeout(&priv->unblock_shutdown,
-						 PROBE_TIMEOUT))
-			icnss_pr_err("wlan driver probe timeout\n");
+				msecs_to_jiffies(PROBE_TIMEOUT)))
+			icnss_pr_err("modem block shutdown timeout\n");
 	}
 
 	if (test_bit(ICNSS_PDR_REGISTERED, &priv->state)) {