Skip to content

Commit

Permalink
Revert "mmc: sdhci-pci: Add MSI support"
Browse files Browse the repository at this point in the history
This reverts commit e603983.
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>
  • Loading branch information
Chris Ball committed Apr 6, 2012
1 parent 84e41d2 commit 79263f3
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions drivers/mmc/host/sdhci-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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);

Expand All @@ -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);
}
Expand Down

0 comments on commit 79263f3

Please sign in to comment.