diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 90f030caecda..93a0d66adeb5 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -11338,7 +11338,7 @@ int hdd_wlan_stop_modules(struct hdd_context *hdd_ctx, bool ftm_mode)
 		hdd_ctx->target_hw_name = NULL;
 	}
 
-	if (hdd_get_conparam() != QDF_GLOBAL_EPPING_MODE) {
+	if (hdd_get_conparam() == QDF_GLOBAL_EPPING_MODE) {
 		epping_disable();
 		epping_close();
 	}
diff --git a/core/mac/src/pe/rrm/rrm_api.c b/core/mac/src/pe/rrm/rrm_api.c
index 12127a958222..7bc0dad1da9a 100644
--- a/core/mac/src/pe/rrm/rrm_api.c
+++ b/core/mac/src/pe/rrm/rrm_api.c
@@ -580,7 +580,7 @@ rrm_process_beacon_report_req(struct mac_context *mac,
 	if (!pSmeBcnReportReq)
 		return eRRM_FAILURE;
 
-	/* Allocated memory for pSmeBcnReportReq....will be freed by other modulea */
+	/* Alloc memory for pSmeBcnReportReq, will be freed by other modules */
 	qdf_mem_copy(pSmeBcnReportReq->bssId, pe_session->bssId,
 		     sizeof(tSirMacAddr));
 	pSmeBcnReportReq->messageType = eWNI_SME_BEACON_REPORT_REQ_IND;