diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-08-06 21:52:23 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-08-06 21:52:22 -0700 |
| commit | 7f6b5aa038fa25267e78b90b4eca57d4119fdb79 (patch) | |
| tree | 5f0151c6c69228c111c5361fb32e0e2999e2e62b | |
| parent | 5e1e8026558e5e4dd27c39eb068091fcf54249cc (diff) | |
| parent | 6afee6e21a9b1a2e9fd81913780f7de1241b424e (diff) | |
Merge "cnss2: Clear flag CNSS_DRIVER_UNLOADING after unregister driver finished"
| -rw-r--r-- | drivers/net/wireless/cnss2/pci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/cnss2/pci.c b/drivers/net/wireless/cnss2/pci.c index 33e9955533a4..4869b33c8526 100644 --- a/drivers/net/wireless/cnss2/pci.c +++ b/drivers/net/wireless/cnss2/pci.c @@ -401,8 +401,6 @@ static int cnss_qca6174_shutdown(struct cnss_pci_data *pci_priv) cnss_power_off_device(plat_priv); - clear_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state); - return ret; } @@ -519,7 +517,6 @@ static int cnss_qca6290_shutdown(struct cnss_pci_data *pci_priv) clear_bit(CNSS_FW_READY, &plat_priv->driver_state); clear_bit(CNSS_FW_MEM_READY, &plat_priv->driver_state); - clear_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state); return ret; } @@ -760,6 +757,7 @@ int cnss_pci_unregister_driver_hdlr(struct cnss_pci_data *pci_priv) set_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state); cnss_pci_dev_shutdown(pci_priv); pci_priv->driver_ops = NULL; + clear_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state); return 0; } |