Merge "Revert "qcacld-3.0: Do not access target register in driver unloading"" into wlan-cld3.driver.lnx.2.0-dev

This commit is contained in:
CNSS_WLAN Service 2017-10-26 07:27:56 -07:00 • committed by Gerrit - the friendly Code Review server
commit fa384c5303
2 changed files with 1 additions and 4 deletions

View file

@ -709,13 +709,12 @@ void ol_target_failure(void *instance, QDF_STATUS status)
return;
}
cds_set_recovery_in_progress(true);
if (cds_is_load_or_unload_in_progress()) {
cds_set_recovery_in_progress(false);
BMI_ERR("%s: Loading/Unloading is in progress, ignore!",
__func__);
return;
}
cds_set_recovery_in_progress(true);
ret = hif_check_fw_reg(scn);
if (0 == ret) {

View file

@ -11278,8 +11278,6 @@ static void __hdd_module_exit(void)
pr_info("%s: Unloading driver v%s\n", WLAN_MODULE_NAME,
QWLAN_VERSIONSTR);
cds_set_unload_in_progress(true);
hdd_wait_for_recovery_completion();
wlan_hdd_unregister_driver();