Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79263f33 authored by Chris Ball's avatar Chris Ball
Browse files

Revert "mmc: sdhci-pci: Add MSI support" 



This reverts commit e6039832.
There are reports of MSI breaking SDHCI on multiple chipsets (JMicron
and O2Micro, at least), so this should be reverted until we come up
with a whitelist or something.

Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 84e41d2d

drivers/mmc/host/sdhci-pci.c

+0 −6
Original line number Diff line number Diff line
@@ -1418,8 +1418,6 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev, 


	slots = chip->num_slots;	/* Quirk may have changed this */



	pci_enable_msi(pdev);



	for (i = 0; i < slots; i++) {

		slot = sdhci_pci_probe_slot(pdev, chip, first_bar, i);

		if (IS_ERR(slot)) {
@@ -1438,8 +1436,6 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev, 
	return 0;



free:

	pci_disable_msi(pdev);



	pci_set_drvdata(pdev, NULL);

	kfree(chip);
@@ -1462,8 +1458,6 @@ static void __devexit sdhci_pci_remove(struct pci_dev *pdev) 
		for (i = 0; i < chip->num_slots; i++)

			sdhci_pci_remove_slot(chip->slots[i]);



		pci_disable_msi(pdev);



		pci_set_drvdata(pdev, NULL);

		kfree(chip);

	}