diff options
author | xin He <xinhe@google.com> | 2015-09-21 17:02:19 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-21 17:02:19 +0000 |
commit | cf79ab6e6bc5dd591e02310f5d15b4f2199f0a22 (patch) | |
tree | fe5878bd91b9dab49aeef5b138f8959c7527f5ee | |
parent | fd3dddccd6d02b258a51a9ebe3e3c92f1a52c30c (diff) | |
parent | 5cbe0dca22a31ea90201e47989df44b124f6f13e (diff) | |
download | hardware_broadcom_wlan-cf79ab6e6bc5dd591e02310f5d15b4f2199f0a22.zip hardware_broadcom_wlan-cf79ab6e6bc5dd591e02310f5d15b4f2199f0a22.tar.gz hardware_broadcom_wlan-cf79ab6e6bc5dd591e02310f5d15b4f2199f0a22.tar.bz2 |
Merge "Fix crash caused in wifi_cleanup" into mnc-dr-dev
-rw-r--r-- | bcmdhd/wifi_hal/wifi_hal.cpp | 6 |
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++; } } |