diff options
Diffstat (limited to 'qcwcn/wifi_hal')
| -rw-r--r-- | qcwcn/wifi_hal/wifi_hal.cpp | 7 | ||||
| -rw-r--r-- | qcwcn/wifi_hal/wifilogger.cpp | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/qcwcn/wifi_hal/wifi_hal.cpp b/qcwcn/wifi_hal/wifi_hal.cpp index 4ec60e7..f46a22c 100644 --- a/qcwcn/wifi_hal/wifi_hal.cpp +++ b/qcwcn/wifi_hal/wifi_hal.cpp @@ -626,7 +626,7 @@ wifi_error wifi_initialize(wifi_handle *handle) ret = wifi_get_logger_supported_feature_set(iface_handle, &info->supported_logger_feature_set); if (ret != WIFI_SUCCESS) - ALOGE("Failed to get supported logger featur set: %d", ret); + ALOGE("Failed to get supported logger feature set: %d", ret); ret = get_firmware_bus_max_size_supported(iface_handle); if (ret != WIFI_SUCCESS) { @@ -635,10 +635,8 @@ wifi_error wifi_initialize(wifi_handle *handle) } ret = wifi_logger_ring_buffers_init(info); - if (ret != WIFI_SUCCESS) { + if (ret != WIFI_SUCCESS) ALOGE("Wifi Logger Ring Initialization Failed"); - goto unload; - } ret = wifi_get_capabilities(iface_handle); if (ret != WIFI_SUCCESS) @@ -710,6 +708,7 @@ unload: } if (info->pkt_stats) free(info->pkt_stats); if (info->rx_aggr_pkts) free(info->rx_aggr_pkts); + wifi_logger_ring_buffers_deinit(info); cleanupGscanHandlers(info); cleanupRSSIMonitorHandler(info); free(info->event_cb); diff --git a/qcwcn/wifi_hal/wifilogger.cpp b/qcwcn/wifi_hal/wifilogger.cpp index 799b23e..11a6b6e 100644 --- a/qcwcn/wifi_hal/wifilogger.cpp +++ b/qcwcn/wifi_hal/wifilogger.cpp @@ -906,6 +906,9 @@ void wifi_logger_ring_buffers_deinit(hal_info *info) { int i; + if (!(info->supported_logger_feature_set & LOGGER_RING_BUFFER)) + return; + for (i = 0; i < NUM_RING_BUFS; i++) { rb_deinit(&info->rb_infos[i]); } |