diff options
author | Chris Ball <cjb@laptop.org> | 2012-04-03 16:47:55 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2012-04-05 20:32:31 -0400 |
commit | 84e41d2d56fbacfd888ab1382e94e752da176582 (patch) | |
tree | c5d98df428bf80a443f7c8927adefadbd4a697d5 /drivers | |
parent | 93fc5a47f25c41125b30c0bf4f243bf3204a1a0a (diff) |
Revert "mmc: sdhci-pci: add quirks for broken MSI on O2Micro controllers"
This reverts commit c16e981b2fd9455af670a69a84f4c8cf07e12658, because
it's no longer useful once MSI support is reverted.
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mmc/host/sdhci-pci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index 9303f7fc1e68..fbbebe251e01 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c | |||
@@ -561,7 +561,6 @@ static int jmicron_resume(struct sdhci_pci_chip *chip) | |||
561 | 561 | ||
562 | static const struct sdhci_pci_fixes sdhci_o2 = { | 562 | static const struct sdhci_pci_fixes sdhci_o2 = { |
563 | .probe = o2_probe, | 563 | .probe = o2_probe, |
564 | .quirks2 = SDHCI_QUIRK2_BROKEN_MSI, | ||
565 | }; | 564 | }; |
566 | 565 | ||
567 | static const struct sdhci_pci_fixes sdhci_jmicron = { | 566 | static const struct sdhci_pci_fixes sdhci_jmicron = { |
@@ -1419,8 +1418,7 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev, | |||
1419 | 1418 | ||
1420 | slots = chip->num_slots; /* Quirk may have changed this */ | 1419 | slots = chip->num_slots; /* Quirk may have changed this */ |
1421 | 1420 | ||
1422 | if (!(chip->quirks2 & SDHCI_QUIRK2_BROKEN_MSI)) | 1421 | pci_enable_msi(pdev); |
1423 | pci_enable_msi(pdev); | ||
1424 | 1422 | ||
1425 | for (i = 0; i < slots; i++) { | 1423 | for (i = 0; i < slots; i++) { |
1426 | slot = sdhci_pci_probe_slot(pdev, chip, first_bar, i); | 1424 | slot = sdhci_pci_probe_slot(pdev, chip, first_bar, i); |