commit c15cc159d138c6c0ab9b44d9275ec00eebb20ab6
author Paul Chen <chenpaul@google.com> Wed Aug 12 05:51:12 2020 +0000
committer Paul Chen <chenpaul@google.com> Wed Aug 12 05:51:22 2020 +0000
tree 0d864baf2b809e25777939cd773ce8ec927db4ce
parent a240379a4ac9e83b34f18da4e22094e360eceb1e
parent c9b0df94ddda5929868a1c86e6819aa3370988e3

resolve merge conflicts of c9b0df94ddda5929868a1c86e6819aa3370988e3 to master

Change-Id: Ifa847c55bafb9f268df08f009688398670a800f7

wifi/1.5/default/wifi_legacy_hal.cpp

diff --git a/wifi/1.5/default/wifi_legacy_hal.cpp b/wifi/1.5/default/wifi_legacy_hal.cpp
index 4070568..c024452 100644
--- a/wifi/1.5/default/wifi_legacy_hal.cpp
+++ b/wifi/1.5/default/wifi_legacy_hal.cpp
@@ -376,8 +376,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");