Commit 5b49ee9f authored by Dedy Lansky's avatar Dedy Lansky Committed by Kalle Valo

wil6210: prevent platform callbacks after uninit

After calling platform_ops.uninit() it is still possible to invoke
platform callbacks.
To prevent this, zero platform_ops right after invoking uninit.
Signed-off-by: default avatarDedy Lansky <qca_dlansky@qca.qualcomm.com>
Signed-off-by: default avatarMaya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 68248349
...@@ -191,6 +191,13 @@ static int wil_platform_rop_fw_recovery(void *wil_handle) ...@@ -191,6 +191,13 @@ static int wil_platform_rop_fw_recovery(void *wil_handle)
return 0; return 0;
} }
static void wil_platform_ops_uninit(struct wil6210_priv *wil)
{
if (wil->platform_ops.uninit)
wil->platform_ops.uninit(wil->platform_handle);
memset(&wil->platform_ops, 0, sizeof(wil->platform_ops));
}
static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id) static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{ {
struct wil6210_priv *wil; struct wil6210_priv *wil;
...@@ -327,8 +334,7 @@ static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -327,8 +334,7 @@ static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
err_disable_pdev: err_disable_pdev:
pci_disable_device(pdev); pci_disable_device(pdev);
err_plat: err_plat:
if (wil->platform_ops.uninit) wil_platform_ops_uninit(wil);
wil->platform_ops.uninit(wil->platform_handle);
if_free: if_free:
wil_if_free(wil); wil_if_free(wil);
...@@ -357,8 +363,7 @@ static void wil_pcie_remove(struct pci_dev *pdev) ...@@ -357,8 +363,7 @@ static void wil_pcie_remove(struct pci_dev *pdev)
pci_iounmap(pdev, csr); pci_iounmap(pdev, csr);
pci_release_region(pdev, 0); pci_release_region(pdev, 0);
pci_disable_device(pdev); pci_disable_device(pdev);
if (wil->platform_ops.uninit) wil_platform_ops_uninit(wil);
wil->platform_ops.uninit(wil->platform_handle);
wil_if_free(wil); wil_if_free(wil);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment