summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorService qcabuildsw <qcabuildsw@localhost>2016-07-21 15:31:02 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-07-21 15:31:02 -0700
commit28fddb332d457529adb2f92f7315565eace6f357 (patch)
tree80730efa8b9a13fc77190f27e9a48560ee94ff83
parent5517289868ef2ef7c502312ba40e11af448e152a (diff)
parentfd85ba612bf1291689cdd935af3ba2732d9eed61 (diff)
Merge "qcacld-3.0: Fix assert in wma_rx_service_ready_ext_event API" into wlan-cld3.driver.lnx.1.1-dev
-rw-r--r--core/wma/src/wma_main.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index a0d9e9439805..b1811221c8fd 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -4570,16 +4570,20 @@ static void wma_populate_soc_caps(t_wma_handle *wma_handle,
* first thing to do is to get how many number of hw modes are
* supported and populate in wma_handle global structure
*/
+ if (NULL == param_buf->soc_hw_mode_caps) {
+ WMA_LOGE("%s: Invalid number of hw modes", __func__);
+ return;
+ }
+
qdf_mem_copy(&phy_caps->num_hw_modes,
param_buf->soc_hw_mode_caps,
sizeof(WMI_SOC_MAC_PHY_HW_MODE_CAPS));
if (0 == phy_caps->num_hw_modes.num_hw_modes) {
- WMA_LOGE("%s: Invalid number of hw modes", __func__);
+ WMA_LOGE("%s: Number of hw modes is zero", __func__);
return;
- } else {
- WMA_LOGI("%s: Given number of hw modes[%d]",
- __func__, phy_caps->num_hw_modes.num_hw_modes);
}
+ WMA_LOGI("%s: Given number of hw modes[%d]",
+ __func__, phy_caps->num_hw_modes.num_hw_modes);
/*
* next thing is to allocate the memory to map hw mode to phy/mac caps