Skip to contentSkip to conversation

misc: alcor_pci: set NULL intfdata and clear pci master

PATCH New Shuah Khan 1 participant 1 message May 17, 2022 Char and misc drivers

lore
Share & tools
lore

Shuah Khan

author
#0 lore raw

PATCH 1/1 misc: alcor_pci: set NULL intfdata and clear pci master

alcor_pci doesn't set driver data to NULL and clear pci master when probe fails. Doesn't clear pci master from remove interface. Clearing pci master is necessary to disable bus mastering and prevent DMAs after driver removal.

Fix alcor_pci_probe() to set driver data to NULL and clear pci master from its error path. Fix alcor_pci_remove() to clear pci master.

---
 drivers/misc/cardreader/alcor_pci.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/misc/cardreader/alcor_pci.c +5 -1
index 3f514d77a843..9080f9f150a2 100644
@@ -317,12 +317,15 @@ static int alcor_pci_probe(struct pci_dev *pdev,
 	ret = mfd_add_devices(&pdev->dev, priv->id, alcor_pci_cells,
 			ARRAY_SIZE(alcor_pci_cells), NULL, 0, NULL);
 	if (ret < 0)
-		goto error_release_regions;
+		goto error_clear_drvdata;
 
 	alcor_pci_aspm_ctrl(priv, 0);
 
 	return 0;
 
+error_clear_drvdata:
+	pci_clear_master(pdev);
+	pci_set_drvdata(pdev, NULL);
 error_release_regions:
 	pci_release_regions(pdev);
 error_free_ida:
@@ -343,6 +346,7 @@ static void alcor_pci_remove(struct pci_dev *pdev)
 	ida_free(&alcor_pci_idr, priv->id);
 
 	pci_release_regions(pdev);
+	pci_clear_master(pdev);
 	pci_set_drvdata(pdev, NULL);
 }
 
Signature · 1 line
2.34.1