Просмотр исходного кода

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: 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>
Dedy Lansky 8 лет назад
Родитель
Сommit
5b49ee9f13
1 измененных файлов с 9 добавлено и 4 удалено
  1. 9 4
      drivers/net/wireless/ath/wil6210/pcie_bus.c

+ 9 - 4
drivers/net/wireless/ath/wil6210/pcie_bus.c

@@ -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 @@ err_release_reg:
 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->platform_handle);
+	wil_platform_ops_uninit(wil);
 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)
 	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->platform_handle);
+	wil_platform_ops_uninit(wil);
 	wil_if_free(wil);
 	wil_if_free(wil);
 }
 }