diff options
| -rw-r--r-- | CORE/CLD_TXRX/HTT/htt_tx.c | 6 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg.c | 3 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/sch/schMessage.c | 4 | ||||
| -rw-r--r-- | CORE/SERVICES/HTC/htc_send.c | 7 |
4 files changed, 12 insertions, 8 deletions
diff --git a/CORE/CLD_TXRX/HTT/htt_tx.c b/CORE/CLD_TXRX/HTT/htt_tx.c index d70f10f8f9b8..364151ac2e69 100644 --- a/CORE/CLD_TXRX/HTT/htt_tx.c +++ b/CORE/CLD_TXRX/HTT/htt_tx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014, 2016-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2011, 2014, 2016-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -786,7 +786,7 @@ int htt_tx_ipa_uc_attach(struct htt_pdev_t *pdev, &pdev->ipa_uc_tx_rsc.tx_ce_idx.paddr, adf_os_get_dma_mem_context( (&pdev->ipa_uc_tx_rsc.tx_ce_idx), memctx)); - if (!pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr) { + if (NULL == pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr) { adf_os_print("%s: CE Write Index WORD alloc fail", __func__); return -1; } @@ -798,7 +798,7 @@ int htt_tx_ipa_uc_attach(struct htt_pdev_t *pdev, &pdev->ipa_uc_tx_rsc.tx_comp_base.paddr, adf_os_get_dma_mem_context( (&pdev->ipa_uc_tx_rsc.tx_comp_base), memctx)); - if (!pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr) { + if (NULL == pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr) { adf_os_print("%s: TX COMP ring alloc fail", __func__); return_code = -2; goto free_tx_ce_idx; diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c index 3d3aae5ad367..08c6b267a118 100644 --- a/CORE/HDD/src/wlan_hdd_cfg.c +++ b/CORE/HDD/src/wlan_hdd_cfg.c @@ -5493,13 +5493,14 @@ VOS_STATUS hdd_parse_config_ini(hdd_context_t* pHddCtx) hddLog(LOG1, "%s: qcom_cfg.ini Size %zu", __func__, fw->size); buffer = (char*)vos_mem_malloc(fw->size + 1); - buffer[fw->size] = '\0'; if(NULL == buffer) { hddLog(VOS_TRACE_LEVEL_FATAL, "%s: kmalloc failure",__func__); release_firmware(fw); return VOS_STATUS_E_FAILURE; } + + buffer[fw->size] = '\0'; pTemp = buffer; vos_mem_copy((void*)buffer,(void *)fw->data, fw->size); diff --git a/CORE/MAC/src/pe/sch/schMessage.c b/CORE/MAC/src/pe/sch/schMessage.c index 12bfadeb4f58..d26f154073a3 100644 --- a/CORE/MAC/src/pe/sch/schMessage.c +++ b/CORE/MAC/src/pe/sch/schMessage.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014, 2016-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2014, 2016-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -357,7 +357,7 @@ sch_get_hostapd_edca(tpAniSirGlobal pMac, if (local) { for (i = 0; i < MAX_NUM_AC; i++) { - tANI_U8 data[WNI_CFG_EDCA_HOSTAPD_ACVO_LOCAL_LEN]; + tANI_U8 data[WNI_CFG_EDCA_HOSTAPD_ACVO_LOCAL_LEN] = {0}; tANI_U32 len = WNI_CFG_EDCA_HOSTAPD_ACVO_LOCAL_LEN; prf = &hostapd_edca_local[i]; diff --git a/CORE/SERVICES/HTC/htc_send.c b/CORE/SERVICES/HTC/htc_send.c index ad47adc79ded..ee5902c44286 100644 --- a/CORE/SERVICES/HTC/htc_send.c +++ b/CORE/SERVICES/HTC/htc_send.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -1294,6 +1294,7 @@ A_STATUS HTCSendPktsMultiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQueue) A_STATUS HTCSendPkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket) { HTC_PACKET_QUEUE queue; + A_STATUS send_status; if (HTCHandle == NULL || pPacket == NULL) { return A_ERROR; @@ -1303,7 +1304,9 @@ A_STATUS HTCSendPkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket) ("+-HTCSendPkt: Enter endPointId: %d, buffer: %pK, length: %d \n", pPacket->Endpoint, pPacket->pBuffer, pPacket->ActualLength)); INIT_HTC_PACKET_QUEUE_AND_ADD(&queue,pPacket); - return HTCSendPktsMultiple(HTCHandle, &queue); + send_status = HTCSendPktsMultiple(HTCHandle, &queue); + pPacket = NULL; + return send_status; } #ifdef ATH_11AC_TXCOMPACT |