diff --git a/core/hdd/src/wlan_hdd_debugfs_llstat.c b/core/hdd/src/wlan_hdd_debugfs_llstat.c
index 6b8e4fc2a113..22470b65692d 100644
--- a/core/hdd/src/wlan_hdd_debugfs_llstat.c
+++ b/core/hdd/src/wlan_hdd_debugfs_llstat.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -115,11 +116,17 @@ void hdd_debugfs_process_iface_stats(struct hdd_adapter *adapter,
 		ll_stats.len += len;
 		len = scnprintf(buffer,
 				DEBUGFS_LLSTATS_BUF_SIZE - ll_stats.len,
-				"\nac_type: %d, tx_mpdu: %u, rx_mpdu: %u, tx_mcast: %u, rx_mcast: %u, rx_ampdu: %u tx_ampdu: %u, mpdu_lost: %u, retries: %u, retries_short: %u, retries_long: %u, contention_time: min-%u max-%u avg-%u, contention num samples: %u, tx_pending_msdu: %u",
+				"\nac_type: %d, tx_mpdu: %u, rx_mpdu: %u, "
+				"tx_mcast: %u, rx_mcast: %u, tx_ampdu: %u, "
+				"rx_ampdu: %u, mpdu_lost: %u, retries: %u, "
+				"retries_short: %u, retries_long: %u, "
+				"contention_time: min-%u max-%u avg-%u, "
+				"contention num samples: %u, "
+				"tx_pending_msdu: %u",
 				ac_stats->ac_type,
 				ac_stats->tx_mpdu, ac_stats->rx_mpdu,
 				ac_stats->tx_mcast, ac_stats->rx_mcast,
-				ac_stats->rx_ampdu, ac_stats->rx_ampdu,
+				ac_stats->tx_ampdu, ac_stats->rx_ampdu,
 				ac_stats->mpdu_lost, ac_stats->retries,
 				ac_stats->retries_short, ac_stats->retries_long,
 				ac_stats->contention_time_min,
diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c
index 9f39697ef690..9d46488cd79d 100644
--- a/core/hdd/src/wlan_hdd_power.c
+++ b/core/hdd/src/wlan_hdd_power.c
@@ -2351,7 +2351,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
 	if (ucfg_ipa_suspend(hdd_ctx->pdev)) {
 		hdd_err("IPA not ready to suspend!");
 		wlan_hdd_inc_suspend_stats(hdd_ctx, SUSPEND_FAIL_IPA);
-		return -EAGAIN;
+		goto resume_all_components;
 	}
 
 	/* Suspend control path scheduler */
@@ -2436,6 +2436,9 @@ resume_ol_rx:
 	hdd_ctx->is_scheduler_suspended = false;
 resume_tx:
 	hdd_resume_wlan();
+resume_all_components:
+	ucfg_pmo_resume_all_components(hdd_ctx->psoc, QDF_SYSTEM_SUSPEND);
+
 	return -ETIME;
 
 }
diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h
index 66b95e232b1b..4e28b018aad0 100644
--- a/core/mac/inc/qwlan_version.h
+++ b/core/mac/inc/qwlan_version.h
@@ -32,9 +32,9 @@
 #define QWLAN_VERSION_MAJOR            2
 #define QWLAN_VERSION_MINOR            0
 #define QWLAN_VERSION_PATCH            8
-#define QWLAN_VERSION_EXTRA            "H"
+#define QWLAN_VERSION_EXTRA            "J"
 #define QWLAN_VERSION_BUILD            31
 
-#define QWLAN_VERSIONSTR               "2.0.8.31H"
+#define QWLAN_VERSIONSTR               "2.0.8.31J"
 
 #endif /* QWLAN_VERSION_H */