diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-05 03:36:01 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-05 03:36:01 -0700 |
| commit | f64ebb93f35744f739a4d5b545907c0dabbc331a (patch) | |
| tree | 2f2ccf9a39d9b7e1cd1cca7a0e3d6b5fa6fd3e8f | |
| parent | 9d06b93823bc3adb8e23e48c91eb0c81cb98cf94 (diff) | |
| parent | 7e387c1626e27870a8fbb3eccd750b9eb3d960f3 (diff) | |
Merge "qcacld-2.0: Do not access target register in driver unloading" into wlan-cld2.driver.lnx.1.0-dev
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_main.c | 12 | ||||
| -rw-r--r-- | CORE/SERVICES/BMI/ol_fw.c | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index a2e9284b7feb..018908e8eb8e 100644 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -16626,6 +16626,12 @@ static void hdd_driver_exit(void) pHddCtx->driver_being_stopped = false; + rtnl_lock(); + pHddCtx->isUnloadInProgress = TRUE; + vos_set_load_unload_in_progress(VOS_MODULE_ID_VOSS, TRUE); + vos_set_unload_in_progress(TRUE); + rtnl_unlock(); + while(pHddCtx->isLogpInProgress || vos_is_logp_in_progress(VOS_MODULE_ID_VOSS, NULL)) { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, @@ -16638,12 +16644,6 @@ static void hdd_driver_exit(void) VOS_BUG(0); } } - - rtnl_lock(); - pHddCtx->isUnloadInProgress = TRUE; - vos_set_load_unload_in_progress(VOS_MODULE_ID_VOSS, TRUE); - vos_set_unload_in_progress(TRUE); - rtnl_unlock(); } vos_wait_for_work_thread_completion(__func__); diff --git a/CORE/SERVICES/BMI/ol_fw.c b/CORE/SERVICES/BMI/ol_fw.c index 5181120d3e6e..47e665365b23 100644 --- a/CORE/SERVICES/BMI/ol_fw.c +++ b/CORE/SERVICES/BMI/ol_fw.c @@ -1470,12 +1470,13 @@ void ol_target_failure(void *instance, A_STATUS status) } #endif + vos_set_logp_in_progress(VOS_MODULE_ID_VOSS, TRUE); if (vos_is_load_unload_in_progress(VOS_MODULE_ID_VOSS, NULL)) { printk("%s: Loading/Unloading is in progress, ignore!\n", __func__); + vos_set_logp_in_progress(VOS_MODULE_ID_VOSS, FALSE); return; } - vos_set_logp_in_progress(VOS_MODULE_ID_VOSS, TRUE); #ifdef HIF_PCI ret = hif_pci_check_fw_reg(scn->hif_sc); |