Merge "qca-wifi: Fix KW issues in cfr component"

target_if/cfr/src/target_if_cfr_8074v2.c

@@ -204,8 +204,8 @@ int correlate_and_relay(struct wlan_objmgr_pdev *pdev, uint32_t cookie,
 bool cfr_dbr_event_handler(struct wlan_objmgr_pdev *pdev,
 						   struct direct_buf_rx_data *payload)
 {
-	uint8_t *data = payload->vaddr;
-	uint32_t cookie = payload->cookie;
+	uint8_t *data = NULL;
+	uint32_t cookie = 0;
 	struct whal_cfir_dma_hdr dma_hdr = {0};
 	int  length = 8, tones = 0, status = 0;
 	struct wlan_objmgr_psoc *psoc;
@@ -231,6 +231,9 @@ bool cfr_dbr_event_handler(struct wlan_objmgr_pdev *pdev,
 		return true;
 	}
 
+	data = payload->vaddr;
+	cookie = payload->cookie;
+
 	cfr_debug("bufferaddr: 0x%pK cookie: %u", payload->paddr, cookie);
 	qdf_mem_copy(&dma_hdr, &data[0], sizeof(struct whal_cfir_dma_hdr));
 

umac/cfr/dispatcher/src/wlan_cfr_tgt_api.c

@@ -149,7 +149,7 @@ int tgt_cfr_stop_capture(struct wlan_objmgr_pdev *pdev,
 			 struct wlan_objmgr_peer *peer)
 {
 	struct wlan_lmac_if_cfr_tx_ops *cfr_tx_ops = NULL;
-	int status;
+	int status = 0;
 	struct wlan_objmgr_psoc *psoc = wlan_pdev_get_psoc(pdev);
 
 	cfr_tx_ops = wlan_psoc_get_cfr_txops(psoc);