diff options
| author | Dennis Jeon <dennis.jeon@broadcom.com> | 2022-06-16 04:38:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-16 04:38:05 +0000 |
| commit | ed7dfda72d5444956e27e67b2b21c50caa45b691 (patch) | |
| tree | d66582493f878e195b3ef8e18a755119062f1a44 | |
| parent | 168a8dda1c702078b63820bed2fad1d0da7ffcc8 (diff) | |
| parent | e784a9cf59203c900f68352c691675aea46ca015 (diff) | |
| download | wlan-ed7dfda72d5444956e27e67b2b21c50caa45b691.tar.gz | |
HAL: Fixed to propagate error when pre-init fails am: e784a9cf59
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/18910392
Change-Id: I0bdbca50e13ff9a08e632161923a060062e5eaee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | bcmdhd/wifi_hal/wifi_hal.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bcmdhd/wifi_hal/wifi_hal.cpp b/bcmdhd/wifi_hal/wifi_hal.cpp index 82974bd..9a5394c 100755 --- a/bcmdhd/wifi_hal/wifi_hal.cpp +++ b/bcmdhd/wifi_hal/wifi_hal.cpp @@ -565,12 +565,13 @@ wifi_error wifi_wait_for_driver_ready(void) // Function times out after 10 seconds int count = (POLL_DRIVER_MAX_TIME_MS * 1000) / POLL_DRIVER_DURATION_US; FILE *fd; + wifi_error status = WIFI_SUCCESS; do { if ((fd = fopen("/sys/class/net/wlan0", "r")) != NULL) { fclose(fd); - wifi_pre_initialize(); - return WIFI_SUCCESS; + status = wifi_pre_initialize(); + return status; } usleep(POLL_DRIVER_DURATION_US); } while(--count > 0); |