From 676e4e98197d9f2e803f299764e86a748e5bafda Mon Sep 17 00:00:00 2001 From: Sarada Prasanna Garnayak Date: Thu, 7 Jul 2016 17:02:24 +0530 Subject: qcacld-2.0: skip VOS_BUG if SSR is already in progress If firmware crashed during the runtime suspend and SSR triggered. The SSR is doing the runtime resume and if resume process failed it is triggering the VOS_BUG. Ignore the VOS_BUG if SSR is already in progress to avoid unnecessary device crash. CRs-Fixed: 1038254 Change-Id: Id7f2e8b16767cd4b03671e34d999ef14e7a1c6ce --- CORE/SERVICES/HIF/PCIe/if_pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CORE/SERVICES/HIF/PCIe/if_pci.c b/CORE/SERVICES/HIF/PCIe/if_pci.c index c2b093cdbdb9..af339871abad 100644 --- a/CORE/SERVICES/HIF/PCIe/if_pci.c +++ b/CORE/SERVICES/HIF/PCIe/if_pci.c @@ -1287,7 +1287,9 @@ static int __hif_pci_runtime_resume(struct pci_dev *pdev) out: /* In Resume we should never fail */ hif_pci_runtime_pm_warn(sc, "Runtime Resume Failed"); - VOS_BUG(0); + /* skip VOS_BUG if SSR is already in progress */ + if (!vos_is_logp_in_progress(VOS_MODULE_ID_HIF, NULL)) + VOS_BUG(0); return ret; } -- cgit v1.2.3