diff options
| author | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2015-02-12 18:33:38 +0530 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2015-02-12 18:35:15 +0530 |
| commit | f700757c9e73534fd1bfe3ce9658b7fbe57dbd65 (patch) | |
| tree | a72b2cc34f034fe8db0de3a8b48b865fca795679 | |
| parent | e995de9bac680551bac84780b6ff6b4885932405 (diff) | |
| parent | 273ccf74bdc2cff9932b6f8f2b72d7feae1cdc85 (diff) | |
Release 4.0.10.33 QCACLD WLAN Driver
Merge remote-tracking branch 'origin/caf/caf-wlan/master' into HEAD
* origin/caf/caf-wlan/master:
Cafstaging Release 4.0.10.33
qcacld: Add NULL check in SME GetCommandBuffer routine
Change-Id: I38b8c3f5bc034eab56451413de1fdf5380e2931c
| -rw-r--r-- | CORE/MAC/inc/qwlan_version.h | 4 | ||||
| -rw-r--r-- | CORE/SME/src/sme_common/sme_Api.c | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h index da728e083c7e..921abe3e1e02 100644 --- a/CORE/MAC/inc/qwlan_version.h +++ b/CORE/MAC/inc/qwlan_version.h @@ -42,9 +42,9 @@ BRIEF DESCRIPTION: #define QWLAN_VERSION_MINOR 0 #define QWLAN_VERSION_PATCH 10 #define QWLAN_VERSION_EXTRA "" -#define QWLAN_VERSION_BUILD 32 +#define QWLAN_VERSION_BUILD 33 -#define QWLAN_VERSIONSTR "4.0.10.32" +#define QWLAN_VERSIONSTR "4.0.10.33" #define AR6320_REV1_VERSION 0x5000000 diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c index 54c580364a62..0915f94f1d50 100644 --- a/CORE/SME/src/sme_common/sme_Api.c +++ b/CORE/SME/src/sme_common/sme_Api.c @@ -455,9 +455,12 @@ tSmeCmd *smeGetCommandBuffer( tpAniSirGlobal pMac ) } /* memset to zero */ - vos_mem_set((tANI_U8 *)&pRetCmd->command, sizeof(pRetCmd->command), 0); - vos_mem_set((tANI_U8 *)&pRetCmd->sessionId, sizeof(pRetCmd->sessionId), 0); - vos_mem_set((tANI_U8 *)&pRetCmd->u, sizeof(pRetCmd->u), 0); + if (pRetCmd) { + vos_mem_set((tANI_U8 *)&pRetCmd->command, sizeof(pRetCmd->command), 0); + vos_mem_set((tANI_U8 *)&pRetCmd->sessionId, + sizeof(pRetCmd->sessionId), 0); + vos_mem_set((tANI_U8 *)&pRetCmd->u, sizeof(pRetCmd->u), 0); + } return(pRetCmd); } |