commit 74896bed49b669e4c7e2cf5f93df15a2d50a0f2e
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 12 14:27:20 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 12 14:27:20 2020 +0000
tree b9d60f37219479cbcb8b3a9aba42a270da86ba80
parent f4b2a450560449655b46dd0e142ffdd30412fb20
parent 55a4f59fb8ca7fb83b3ca14d560c30e2c5239a16

Merge "Fix double release of ScopedWakelock" into rvc-qpr-dev

wifi/1.4/default/wifi_legacy_hal.cpp

diff --git a/wifi/1.4/default/wifi_legacy_hal.cpp b/wifi/1.4/default/wifi_legacy_hal.cpp
index 29123bf..75f22ec 100644
--- a/wifi/1.4/default/wifi_legacy_hal.cpp
+++ b/wifi/1.4/default/wifi_legacy_hal.cpp
@@ -367,8 +367,8 @@
     }
     LOG(DEBUG) << "Waiting for the driver ready";
     wifi_error status = global_func_table_.wifi_wait_for_driver_ready();
-    if (status == WIFI_ERROR_TIMED_OUT) {
-        LOG(ERROR) << "Timed out awaiting driver ready";
+    if (status == WIFI_ERROR_TIMED_OUT || status == WIFI_ERROR_UNKNOWN) {
+        LOG(ERROR) << "Failed or timed out awaiting driver ready";
         return status;
     }
     property_set(kDriverPropName, "ok");