Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70edf3aa authored by Paul Chen's avatar Paul Chen Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of c9b0df94 to master"

parents c5d03468 c15cc159

wifi/1.5/default/wifi_legacy_hal.cpp

+2 −2
Original line number Diff line number Diff line
@@ -372,8 +372,8 @@ wifi_error WifiLegacyHal::start() { 
    }

    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;

    }