mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 14:13:01 -04:00
Merge "cnss2: Unregister host driver during PCI remove"
This commit is contained in:
commit
7824075f31
1 changed files with 8 additions and 1 deletions
|
|
@ -3039,8 +3039,12 @@ int cnss_pci_register_driver_hdlr(struct cnss_pci_data *pci_priv,
|
|||
|
||||
int cnss_pci_unregister_driver_hdlr(struct cnss_pci_data *pci_priv)
|
||||
{
|
||||
struct cnss_plat_data *plat_priv = pci_priv->plat_priv;
|
||||
struct cnss_plat_data *plat_priv;
|
||||
|
||||
if (!pci_priv)
|
||||
return -EINVAL;
|
||||
|
||||
plat_priv = pci_priv->plat_priv;
|
||||
set_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state);
|
||||
cnss_pci_dev_shutdown(pci_priv);
|
||||
pci_priv->driver_ops = NULL;
|
||||
|
|
@ -5739,7 +5743,9 @@ static void cnss_pci_unregister_mhi(struct cnss_pci_data *pci_priv)
|
|||
mhi_unregister_mhi_controller(mhi_ctrl);
|
||||
cnss_pci_mhi_ipc_logging_deinit(pci_priv);
|
||||
kfree(mhi_ctrl->irq);
|
||||
mhi_ctrl->irq = NULL;
|
||||
mhi_free_controller(mhi_ctrl);
|
||||
pci_priv->mhi_ctrl = NULL;
|
||||
}
|
||||
|
||||
static void cnss_pci_config_regs(struct cnss_pci_data *pci_priv)
|
||||
|
|
@ -6118,6 +6124,7 @@ static void cnss_pci_remove(struct pci_dev *pci_dev)
|
|||
struct cnss_plat_data *plat_priv =
|
||||
cnss_bus_dev_to_plat_priv(&pci_dev->dev);
|
||||
|
||||
cnss_pci_unregister_driver_hdlr(pci_priv);
|
||||
cnss_pci_free_m3_mem(pci_priv);
|
||||
cnss_pci_free_fw_mem(pci_priv);
|
||||
cnss_pci_free_qdss_mem(pci_priv);
|
||||
|
|
|
|||
Loading…
Reference in a new issue