aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mmc/host/sdhci-pci.c4
-rw-r--r--include/linux/mmc/sdhci.h2
2 files changed, 1 insertions, 5 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
562static const struct sdhci_pci_fixes sdhci_o2 = { 562static 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
567static const struct sdhci_pci_fixes sdhci_jmicron = { 566static 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);
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index 9752fe434ae9..e9051e1cb1ce 100644
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -91,8 +91,6 @@ struct sdhci_host {
91 unsigned int quirks2; /* More deviations from spec. */ 91 unsigned int quirks2; /* More deviations from spec. */
92 92
93#define SDHCI_QUIRK2_HOST_OFF_CARD_ON (1<<0) 93#define SDHCI_QUIRK2_HOST_OFF_CARD_ON (1<<0)
94/* broken MSI Interrupts */
95#define SDHCI_QUIRK2_BROKEN_MSI (1<<1)
96 94
97 int irq; /* Device IRQ */ 95 int irq; /* Device IRQ */
98 void __iomem *ioaddr; /* Mapped address */ 96 void __iomem *ioaddr; /* Mapped address */