From 67abd8054f4321dabd53aa649c14d78f774b1cea Mon Sep 17 00:00:00 2001 From: Yuanyuan Liu Date: Wed, 11 Oct 2017 16:36:55 -0700 Subject: [PATCH] Revert "qcacld-3.0: Do not access target register in driver unloading" This reverts Change-Id: I2a4980b6cd4b689da07c34f2acdfaafbbb0715bb. This change set driver unload state before unload work is scheduled, which causes async between platform driver and wlan host driver. Change-Id: Ieaf1cf0a257f69bf8958085c48d9020f1b5ec610 CRs-Fixed: 2124953 --- core/bmi/src/ol_fw.c | 3 +-- core/hdd/src/wlan_hdd_main.c | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index 66e1cd477bd3..450d18c943bc 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -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) { diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 40cbc5ea0771..dabf33015f76 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -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();