Commit 8e04a7af authored by Shuah Khan's avatar Shuah Khan Committed by Greg Kroah-Hartman
Browse files

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.

Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
Link: https://lore.kernel.org/r/20220517203630.45232-1-skhan@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5621a0bc

drivers/misc/cardreader/alcor_pci.c

+5 −1
Original line number Diff line number Diff line
@@ -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);

}