Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed7a20b6 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Unregister host driver during PCI remove"

parents 0110b73b b9c738c9

drivers/net/wireless/cnss2/pci.c

+8 −1
Original line number Diff line number Diff line
@@ -2542,8 +2542,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;
@@ -4924,7 +4928,9 @@ static void cnss_pci_unregister_mhi(struct cnss_pci_data *pci_priv) 
	if (mhi_ctrl->cntrl_log_buf)

		ipc_log_context_destroy(mhi_ctrl->cntrl_log_buf);

	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)
@@ -5079,6 +5085,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);