summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKapil Gupta <kapgupta@codeaurora.org>2016-09-26 12:22:43 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2016-10-11 23:50:34 -0700
commitb040160e697c99e65c805907c87a6c9d663b62be (patch)
tree8c886782e2bce970fa1c17cd769b6213c57de50f
parent2a9b2799c6fe84cb06c6c3abb2d64408595cebd3 (diff)
qcacld-2.0: Remove unnecessary NULL check
qcacld-3.0 to qcacld-2.0 propagation NULL check is not required before freeing the memory allocated to dfs_radartable and dfs_dc_radartable. Add the changes to remove unnecessary NULL checks. Change-Id: I063c036024e6bfc235a418056d15843646bc5a3c CRs-Fixed: 1063843
-rw-r--r--CORE/SERVICES/DFS/src/dfs.c28
1 files changed, 12 insertions, 16 deletions
diff --git a/CORE/SERVICES/DFS/src/dfs.c b/CORE/SERVICES/DFS/src/dfs.c
index 5bd2f3189050..20bc4dfc22c0 100644
--- a/CORE/SERVICES/DFS/src/dfs.c
+++ b/CORE/SERVICES/DFS/src/dfs.c
@@ -466,27 +466,23 @@ dfs_attach(struct ieee80211com *ic)
return 0;
bad3:
- if (dfs->dfs_dc_radartable) {
- for (n = 0; n < MAX_DFS_RADAR_TABLE_TYPE; n++) {
- if (dfs->dfs_dc_radartable[n]) {
- OS_FREE(dfs->dfs_dc_radartable[n]);
- dfs->dfs_dc_radartable[n] = NULL;
- }
+ for (n = 0; n < MAX_DFS_RADAR_TABLE_TYPE; n++) {
+ if (dfs->dfs_dc_radartable[n]) {
+ OS_FREE(dfs->dfs_dc_radartable[n]);
+ dfs->dfs_dc_radartable[n] = NULL;
}
- OS_FREE(dfs->dfs_dc_radartable);
- dfs->dfs_dc_radartable = NULL;
}
+ OS_FREE(dfs->dfs_dc_radartable);
+ dfs->dfs_dc_radartable = NULL;
bad2:
- if (dfs->dfs_radartable != NULL) {
- for (n=0; n < DFS_MAX_RADAR_TYPES; n++) {
- if (dfs->dfs_radartable[n] != NULL) {
- OS_FREE(dfs->dfs_radartable[n]);
- dfs->dfs_radartable[n] = NULL;
- }
+ for (n=0; n < DFS_MAX_RADAR_TYPES; n++) {
+ if (dfs->dfs_radartable[n] != NULL) {
+ OS_FREE(dfs->dfs_radartable[n]);
+ dfs->dfs_radartable[n] = NULL;
}
- OS_FREE(dfs->dfs_radartable);
- dfs->dfs_radartable = NULL;
}
+ OS_FREE(dfs->dfs_radartable);
+ dfs->dfs_radartable = NULL;
bad4:
for (n = 0; n < DFS_MAX_RADAR_TYPES; n++) {
if (dfs->dfs_dc_radarf[n]) {