Browse Source

Revert "qcacld-3.0: Avoid calling idle shutdown many times"

This reverts commit Ic701dce917288db09511f6ffc540cf8cf3eca5db.

New solution idle shutdown in suspend prepare is better.

Change-Id: I10aee75b2fee7026dfbb7173b66cddac24e313d7
CRs-Fixed: 3213236
Yu Ouyang 2 years ago
parent
commit
6e1249d0ea
2 changed files with 1 additions and 4 deletions
  1. 0 1
      core/hdd/src/wlan_hdd_main.c
  2. 1 3
      core/hdd/src/wlan_hdd_power.c

+ 0 - 1
core/hdd/src/wlan_hdd_main.c

@@ -18923,7 +18923,6 @@ void hdd_shutdown_wlan_in_suspend(struct hdd_context *hdd_ctx)
 #define SHUTDOWN_IN_SUSPEND_PREVENT_TIMEOUT 5
 
 	if (!hdd_is_any_interface_open(hdd_ctx)) {
-		hdd_ctx->shutdown_in_suspend = true;
 		qdf_delayed_work_start(&hdd_ctx->psoc_idle_timeout_work,
 				       SHUTDOWN_IN_SUSPEND_WAIT_TIMEOUT);
 		hdd_prevent_suspend_timeout(SHUTDOWN_IN_SUSPEND_PREVENT_TIMEOUT,

+ 1 - 3
core/hdd/src/wlan_hdd_power.c

@@ -2500,10 +2500,8 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
 	}
 
 	if (suspend_mode == PMO_SUSPEND_SHUTDOWN) {
-		if (hdd_ctx->shutdown_in_suspend)
-			return -EAGAIN;
-
 		hdd_info_rl("Shutdown WLAN in Suspend");
+		hdd_ctx->shutdown_in_suspend = true;
 		hdd_shutdown_wlan_in_suspend(hdd_ctx);
 		/* shutdown must be excute in active, so return -EAGAIN
 		 * to PM to exit and try again