diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-06-27 14:44:09 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-06-27 14:44:09 -0700 |
| commit | ce1dcdff6bad467f5027c6e4c33af767e47ec488 (patch) | |
| tree | 395373885d498603a1f9b77783c843c240c81641 /drivers/net/wireless | |
| parent | e130a419a73ab080f845d1ffcc8b3e63d6738535 (diff) | |
| parent | 63e0a765edf7d00e498e50795f22f9b9532a2ebd (diff) | |
Merge "cnss: notify wlan driver when failed to power up"
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/cnss/cnss_pci.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/wireless/cnss/cnss_pci.c b/drivers/net/wireless/cnss/cnss_pci.c index 03219cf1693a..545a1515d7fe 100644 --- a/drivers/net/wireless/cnss/cnss_pci.c +++ b/drivers/net/wireless/cnss/cnss_pci.c @@ -2717,10 +2717,14 @@ err_pcie_link_up: cnss_configure_wlan_en_gpio(WLAN_EN_LOW); cnss_wlan_vreg_set(vreg_info, VREG_OFF); if (penv->pdev) { - pr_err("%d: Unregistering pci device\n", __LINE__); - pci_unregister_driver(&cnss_wlan_pci_driver); - penv->pdev = NULL; - penv->pci_register_again = true; + if (wdrv && wdrv->update_status) + wdrv->update_status(penv->pdev, CNSS_SSR_FAIL); + if (!penv->recovery_in_progress) { + pr_err("%d: Unregistering pci device\n", __LINE__); + pci_unregister_driver(&cnss_wlan_pci_driver); + penv->pdev = NULL; + penv->pci_register_again = true; + } } err_wlan_vreg_on: |