wil6210: prevent platform callbacks after uninit
authorDedy Lansky <qca_dlansky@qca.qualcomm.com>
Fri, 16 Jun 2017 07:38:03 +0000 (10:38 +0300)
committerKalle Valo <kvalo@qca.qualcomm.com>
Wed, 21 Jun 2017 13:18:42 +0000 (16:18 +0300)
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: Dedy Lansky <qca_dlansky@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
drivers/net/wireless/ath/wil6210/pcie_bus.c

index bf9f26563c486f1147c62cd83fc1da7591c0e85e..a874d8dfa19808d40b98c4950fc886f5f9f9f618 100644 (file)
@@ -191,6 +191,13 @@ static int wil_platform_rop_fw_recovery(void *wil_handle)
        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)
 {
        struct wil6210_priv *wil;
@@ -327,8 +334,7 @@ err_release_reg:
 err_disable_pdev:
        pci_disable_device(pdev);
 err_plat:
-       if (wil->platform_ops.uninit)
-               wil->platform_ops.uninit(wil->platform_handle);
+       wil_platform_ops_uninit(wil);
 if_free:
        wil_if_free(wil);
 
@@ -357,8 +363,7 @@ static void wil_pcie_remove(struct pci_dev *pdev)
        pci_iounmap(pdev, csr);
        pci_release_region(pdev, 0);
        pci_disable_device(pdev);
-       if (wil->platform_ops.uninit)
-               wil->platform_ops.uninit(wil->platform_handle);
+       wil_platform_ops_uninit(wil);
        wil_if_free(wil);
 }