summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinit Deshpande <vinitd@google.com>2015-08-13 16:38:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-13 16:38:03 +0000
commit7655c36699464ddd2a26ab530ae670d1584dd41f (patch)
tree2e4d1146120290c3ecba4afda95b0e08f4e19a36
parent1c986a233bad7a78d996d9b4e8b05e22ecb73da8 (diff)
parentaa6ab0f10743dbe6dca28a3ace8ba73b9ee9b0c5 (diff)
downloadhardware_broadcom_wlan-7655c36699464ddd2a26ab530ae670d1584dd41f.zip
hardware_broadcom_wlan-7655c36699464ddd2a26ab530ae670d1584dd41f.tar.gz
hardware_broadcom_wlan-7655c36699464ddd2a26ab530ae670d1584dd41f.tar.bz2
am aa6ab0f1: am 2c9d7bbf: Merge "Fix cleanup of COMPLETE_SCAN event" into mnc-dev
* commit 'aa6ab0f10743dbe6dca28a3ace8ba73b9ee9b0c5': Fix cleanup of COMPLETE_SCAN event
-rw-r--r--bcmdhd/wifi_hal/gscan.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/bcmdhd/wifi_hal/gscan.cpp b/bcmdhd/wifi_hal/gscan.cpp
index 7b0f821..8a21a0d 100644
--- a/bcmdhd/wifi_hal/gscan.cpp
+++ b/bcmdhd/wifi_hal/gscan.cpp
@@ -662,7 +662,7 @@ public:
result = requestResponse(request);
if (result != WIFI_SUCCESS) {
ALOGE("failed to start scan; result = %d", result);
- registerVendorHandler(GOOGLE_OUI, GSCAN_EVENT_COMPLETE_SCAN);
+ unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_COMPLETE_SCAN);
unregisterVendorHandler(GOOGLE_OUI, GSCAN_EVENT_SCAN_RESULTS_AVAILABLE);
return result;
}