diff options
| author | AnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com> | 2016-07-14 23:58:34 +0530 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-07-15 00:08:23 +0530 |
| commit | 0594be759e1dd4d65e7a3a7ac2827db7479fbf86 (patch) | |
| tree | e931b69a2e2ce616c37bf53a1c643f577cb13715 | |
| parent | 860b1689cef0236fdce810c827cf90086f7a93ea (diff) | |
Revert "qcacld-2.0: Avoid simultaneous execution of SSR in two contexts"
This reverts I91f028491f0ecc1daa1f6c5ca95d8b97f5c6fa58.
Change-Id: Ie56da3e84fcfd3a4742d7cfedbc216ecb915296d
CRs-Fixed: 1039070
| -rw-r--r-- | CORE/SERVICES/BMI/ol_fw.c | 8 | ||||
| -rw-r--r-- | CORE/SERVICES/HIF/sdio/linux/native_sdio/src/hif.c | 7 |
2 files changed, 2 insertions, 13 deletions
diff --git a/CORE/SERVICES/BMI/ol_fw.c b/CORE/SERVICES/BMI/ol_fw.c index 71483bb3928a..df4844f8bb1f 100644 --- a/CORE/SERVICES/BMI/ol_fw.c +++ b/CORE/SERVICES/BMI/ol_fw.c @@ -1061,8 +1061,6 @@ static void ramdump_work_handler(struct work_struct *ramdump) printk(KERN_ERR "HifDiagReadiMem FW Dump Area Pointer failed!\n"); #if !defined(HIF_SDIO) ol_copy_ramdump(ramdump_scn); - pr_info("%s- %d: Invoke vos_device_crashed\n", __func__, - __LINE__); vos_device_crashed(dev); return; #endif @@ -1121,10 +1119,7 @@ static void ramdump_work_handler(struct work_struct *ramdump) panic("CNSS Ram dump collected\n"); #else /* Notify SSR framework the target has crashed. */ - if (!vos_is_logp_in_progress(VOS_MODULE_ID_VOSS, NULL)) { - pr_info("%s- %d: Invoke vos_device_crash\n", __func__, __LINE__); - vos_device_crashed(dev); - } + vos_device_crashed(dev); #endif return; @@ -1139,7 +1134,6 @@ out_fail: #if defined(HIF_SDIO) && !defined(CONFIG_CNSS) panic("CNSS Ram dump collection failed \n"); #else - pr_info("%s- %d: Invoke vos_device_crash\n", __func__, __LINE__); vos_device_crashed(dev); #endif #endif diff --git a/CORE/SERVICES/HIF/sdio/linux/native_sdio/src/hif.c b/CORE/SERVICES/HIF/sdio/linux/native_sdio/src/hif.c index 0379cae3798a..b3c8ed7ea4fb 100644 --- a/CORE/SERVICES/HIF/sdio/linux/native_sdio/src/hif.c +++ b/CORE/SERVICES/HIF/sdio/linux/native_sdio/src/hif.c @@ -2722,11 +2722,6 @@ static void hif_sdio_device_removed(struct sdio_func *func) static int hif_sdio_device_reinit(struct sdio_func *func, const struct sdio_device_id * id) { - if (vos_is_shutdown_in_progress(VOS_MODULE_ID_HIF, NULL)) { - pr_err("%s: Shutdown is in progress, don't allow re-init\n", - __func__); - return -EAGAIN; - } if ((func != NULL) && (id != NULL)) return hifDeviceInserted(func, id); else @@ -2804,4 +2799,4 @@ int hif_reset_target(HIF_DEVICE *hif_device) done: return ret; -} +}
\ No newline at end of file |