diff options
author | Steve Kondik <steve@cyngn.com> | 2015-04-03 09:58:15 -0700 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-04-03 09:58:15 -0700 |
commit | 37402d4564a8b281d02b9d88f0b1f1f748fbb608 (patch) | |
tree | 8733e5234fb9de3223f53538f0e19a5ae5279194 | |
parent | aa0a2559c541108181858536b8883b2e439743e2 (diff) | |
parent | c62f5b23314dd270084568fdd86faf018da2045a (diff) | |
download | android_hardware_qcom_wlan-stable/cm-12.1-YOG3C.tar.gz android_hardware_qcom_wlan-stable/cm-12.1-YOG3C.tar.bz2 android_hardware_qcom_wlan-stable/cm-12.1-YOG3C.zip |
Merge branch 'LA.BF64.1.2.1_rb2.6' of git://codeaurora.org/platform/hardware/qcom/wlan into cm-12.1stable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Ccm-12.1
-rw-r--r-- | qcwcn/wifi_hal/gscan_event_handler.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/qcwcn/wifi_hal/gscan_event_handler.cpp b/qcwcn/wifi_hal/gscan_event_handler.cpp index 168a82f..6d78219 100644 --- a/qcwcn/wifi_hal/gscan_event_handler.cpp +++ b/qcwcn/wifi_hal/gscan_event_handler.cpp @@ -1171,15 +1171,17 @@ int GScanCommandEventHandler::handleEvent(WifiEvent &event) case QCA_NL80211_VENDOR_SUBCMD_GSCAN_SIGNIFICANT_CHANGE: { - for (i = 0; i < mSignificantChangeNumResults; i++) - { - if (mSignificantChangeResults[i]) { - free(mSignificantChangeResults[i]); - mSignificantChangeResults[i] = NULL; + if (mSignificantChangeResults) { + for (i = 0; i < mSignificantChangeNumResults; i++) + { + if (mSignificantChangeResults[i]) { + free(mSignificantChangeResults[i]); + mSignificantChangeResults[i] = NULL; + } } + free(mSignificantChangeResults); + mSignificantChangeResults = NULL; } - free(mSignificantChangeResults); - mSignificantChangeResults = NULL; mSignificantChangeNumResults = 0; mSignificantChangeMoreData = false; } |