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

Commit c15cc159 authored by Paul Chen's avatar Paul Chen
Browse files

resolve merge conflicts of c9b0df94 to master 

Change-Id: Ifa847c55bafb9f268df08f009688398670a800f7
parents a240379a c9b0df94

wifi/1.5/default/wifi_legacy_hal.cpp

+2 −2
Original line number Diff line number Diff line
@@ -376,8 +376,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;

    }

    property_set(kDriverPropName, "ok");