Revert "mmc: sdhci-pci: Add MSI support"
This reverts commit e6039832bed9a9b967796d7021f17f25b625b616. 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: Chris Ball <cjb@laptop.org>
This commit is contained in:
parent
84e41d2d56
commit
79263f33b0
@ -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);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user