Merge "icnss: Reduce the shutdown timeout from 50sec to 15sec" (ea11eaa9) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/soc/qcom/icnss.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@ module_param(qmi_timeout, ulong, 0600);

		#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 @@ static int icnss_modem_notifier_nb(struct notifier_block *nb,
		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)) {