commit 70edf3aa1913df3c20f8cf3981ab243fdc633fab
author Paul Chen <chenpaul@google.com> Tue Aug 18 04:57:10 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 18 04:57:10 2020 +0000
tree 3cc19814eae64ae70e41b5e362d06bfa843d0388
parent c5d03468accab66f036e057f3b94c8f3d02712e4
parent c15cc159d138c6c0ab9b44d9275ec00eebb20ab6

Merge "resolve merge conflicts of c9b0df94ddda5929868a1c86e6819aa3370988e3 to master"

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 6ee8937..7d14e9d 100644
--- a/wifi/1.5/default/wifi_legacy_hal.cpp
+++ b/wifi/1.5/default/wifi_legacy_hal.cpp
@@ -372,8 +372,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;
     }