summaryrefslogtreecommitdiffstats
path: root/bcmdhd
diff options
context:
space:
mode:
authorxin He <xinhe@google.com>2015-09-21 17:06:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-21 17:06:28 +0000
commita7d5ed6f661bacc57201d2826395fabce497b77c (patch)
tree149ce4b06366e786d06466842d3824b85a89b80d /bcmdhd
parent11112c7e478d823585703f89e59996c6ce1d00de (diff)
parentcf79ab6e6bc5dd591e02310f5d15b4f2199f0a22 (diff)
downloadhardware_broadcom_wlan-a7d5ed6f661bacc57201d2826395fabce497b77c.zip
hardware_broadcom_wlan-a7d5ed6f661bacc57201d2826395fabce497b77c.tar.gz
hardware_broadcom_wlan-a7d5ed6f661bacc57201d2826395fabce497b77c.tar.bz2
am cf79ab6e: Merge "Fix crash caused in wifi_cleanup" into mnc-dr-dev
* commit 'cf79ab6e6bc5dd591e02310f5d15b4f2199f0a22': Fix crash caused in wifi_cleanup
Diffstat (limited to 'bcmdhd')
-rw-r--r--bcmdhd/wifi_hal/wifi_hal.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/bcmdhd/wifi_hal/wifi_hal.cpp b/bcmdhd/wifi_hal/wifi_hal.cpp
index 00f35d9..28f5565 100644
--- a/bcmdhd/wifi_hal/wifi_hal.cpp
+++ b/bcmdhd/wifi_hal/wifi_hal.cpp
@@ -323,7 +323,7 @@ void wifi_cleanup(wifi_handle handle, wifi_cleaned_up_handler handler)
for (int i = 0; i < info->num_event_cb; i++) {
cb_info *cbi = &(info->event_cb[i]);
WifiCommand *cmd = (WifiCommand *)cbi->cb_arg;
- ALOGE("Command left in event_cb %p:%s", cmd, cmd->getType());
+ ALOGI("Command left in event_cb %p:%s", cmd, (cmd ? cmd->getType(): ""));
}
while (info->num_cmd > bad_commands) {
@@ -331,14 +331,14 @@ void wifi_cleanup(wifi_handle handle, wifi_cleaned_up_handler handler)
cmd_info *cmdi = &(info->cmd[bad_commands]);
WifiCommand *cmd = cmdi->cmd;
if (cmd != NULL) {
- ALOGD("Cancelling command %p:%s", cmd, cmd->getType());
+ ALOGI("Cancelling command %p:%s", cmd, cmd->getType());
pthread_mutex_unlock(&info->cb_lock);
cmd->cancel();
pthread_mutex_lock(&info->cb_lock);
/* release reference added when command is saved */
cmd->releaseRef();
if (num_cmd == info->num_cmd) {
- ALOGE("Cancelling command %p:%s did not work", cmd, cmd->getType());
+ ALOGI("Cancelling command %p:%s did not work", cmd, (cmd ? cmd->getType(): ""));
bad_commands++;
}
}