diff options
| author | Chris Ball <cjb@laptop.org> | 2012-04-03 22:48:32 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2012-04-06 02:32:32 +0200 |
| commit | 79263f33b0f3abe26d74a66824b457b94bdbef9f (patch) | |
| tree | 8ddb614ba1919da7ecdc1ec1ad73062a3520f894 /drivers | |
| parent | Revert "mmc: sdhci-pci: add quirks for broken MSI on O2Micro controllers" (diff) | |
| download | linux-79263f33b0f3abe26d74a66824b457b94bdbef9f.tar.xz linux-79263f33b0f3abe26d74a66824b457b94bdbef9f.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/sdhci-pci.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index fbbebe251e01..69ef0beae104 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c @@ -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); } |