summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandrasekaran, Manishekar <cmshekar@qti.qualcomm.com>2014-01-24 05:00:36 +0530
committerPrakash Dhavali <pdhavali@qca.qualcomm.com>2014-01-28 00:00:44 -0800
commitbabff609b7abc1bbe9322289f35844070dd9eca1 (patch)
treefec9f39bdd5f62c4e3d97c68119eaa8044be068f
parent6e92897b1c811c3b0cede4af72bc934d97049ada (diff)
qcacld: Fix for errors due to static source analysis tool in SERVICES
Running static source analysis on SERVICES module generates quite a few errors/warnings. This fix will help to remove those errors and warnings. Change-Id: I3bc9941f83f7fe59081edb90466e546e12d40baa CRs-Fixed: 600970 Depends-on: 588153
-rw-r--r--CORE/SERVICES/DFS/src/dfs_init.c16
-rw-r--r--CORE/SERVICES/HTC/htc_services.c7
-rw-r--r--CORE/SERVICES/WMA/wma.c21
3 files changed, 29 insertions, 15 deletions
diff --git a/CORE/SERVICES/DFS/src/dfs_init.c b/CORE/SERVICES/DFS/src/dfs_init.c
index 71c5ad9744b4..999dae8625c4 100644
--- a/CORE/SERVICES/DFS/src/dfs_init.c
+++ b/CORE/SERVICES/DFS/src/dfs_init.c
@@ -100,15 +100,17 @@ void dfs_reset_alldelaylines(struct ath_dfs *dfs)
pl->pl_firstelem = pl->pl_numelems = 0;
pl->pl_lastelem = DFS_MAX_PULSE_BUFFER_MASK;
- for (i = 0; i < DFS_MAX_RADAR_TYPES; i++) {
+ for (i=0; i<DFS_MAX_RADAR_TYPES; i++) {
if (dfs->dfs_radarf[i] != NULL) {
ft = dfs->dfs_radarf[i];
- for (j = 0; j < ft->ft_numfilters; j++) {
- rf = &(ft->ft_filters[j]);
- dl = &(rf->rf_dl);
- if (dl != NULL) {
- OS_MEMZERO(dl, sizeof(struct dfs_delayline));
- dl->dl_lastelem = (0xFFFFFFFF) & DFS_MAX_DL_MASK;
+ if (NULL != ft) {
+ for (j = 0; j < ft->ft_numfilters; j++) {
+ rf = &(ft->ft_filters[j]);
+ dl = &(rf->rf_dl);
+ if (dl != NULL) {
+ OS_MEMZERO(dl, sizeof(struct dfs_delayline));
+ dl->dl_lastelem = (0xFFFFFFFF) & DFS_MAX_DL_MASK;
+ }
}
}
}
diff --git a/CORE/SERVICES/HTC/htc_services.c b/CORE/SERVICES/HTC/htc_services.c
index 28f67fa2e481..77e364080292 100644
--- a/CORE/SERVICES/HTC/htc_services.c
+++ b/CORE/SERVICES/HTC/htc_services.c
@@ -91,7 +91,12 @@ A_STATUS HTCConnectService(HTC_HANDLE HTCHandle,
/* assemble connect service message */
adf_nbuf_put_tail(netbuf, length);
pConnectMsg = (HTC_CONNECT_SERVICE_MSG *)adf_nbuf_data(netbuf);
- AR_DEBUG_ASSERT(pConnectMsg != NULL);
+
+ if (NULL == pConnectMsg) {
+ AR_DEBUG_ASSERT(0);
+ status = A_EFAULT;
+ break;
+ }
A_MEMZERO(pConnectMsg,sizeof(HTC_CONNECT_SERVICE_MSG));
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c
index 6437d1a3eb47..bc5b13022b92 100644
--- a/CORE/SERVICES/WMA/wma.c
+++ b/CORE/SERVICES/WMA/wma.c
@@ -5539,6 +5539,12 @@ static void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params)
goto send_resp;
}
pdev = vos_get_context(VOS_MODULE_ID_TXRX, wma->vos_context);
+ if (NULL == pdev) {
+ WMA_LOGE("%s: Failed to get pdev", __func__);
+ status = VOS_STATUS_E_FAILURE;
+ goto send_resp;
+ }
+
peer = ol_txrx_find_peer_by_addr(pdev, intr[vdev_id].bssid, &peer_id);
if (peer && (peer->state == ol_txrx_peer_state_conn ||
@@ -13528,13 +13534,15 @@ VOS_STATUS wma_process_init_thermal_info(tp_wma_handle wma,
t_thermal_mgmt *pThermalParams)
{
t_thermal_cmd_params thermal_params;
- ol_txrx_pdev_handle curr_pdev =
- vos_get_context(VOS_MODULE_ID_TXRX, wma->vos_context);
+ ol_txrx_pdev_handle curr_pdev;
+
+ if (NULL == wma || NULL == pThermalParams) {
+ WMA_LOGE("%s: TM Invalid input", __func__);
+ return VOS_STATUS_E_FAILURE;
+ }
+
+ curr_pdev = vos_get_context(VOS_MODULE_ID_TXRX, wma->vos_context);
- if (NULL == wma || NULL == pThermalParams) {
- WMA_LOGE("TM Invalid input");
- return VOS_STATUS_E_FAILURE;
- }
WMA_LOGD("TM enable %d period %d", pThermalParams->thermalMgmtEnabled,
pThermalParams->throttlePeriod);
@@ -17447,7 +17455,6 @@ wma_dfs_indicate_radar(struct ieee80211com *ic,
}
hdd_ctx = vos_get_context(VOS_MODULE_ID_HDD,wma->vos_context);
-
if (wma->dfs_ic != ic)
{
WMA_LOGE("%s:DFS- Invalid WMA handle\n",__func__);