aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/sdhci-pci.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index fbbebe251e01..9303f7fc1e68 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -561,6 +561,7 @@ 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,
564}; 565};
565 566
566static const struct sdhci_pci_fixes sdhci_jmicron = { 567static const struct sdhci_pci_fixes sdhci_jmicron = {
@@ -1418,7 +1419,8 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev,
1418 1419
1419 slots = chip->num_slots; /* Quirk may have changed this */ 1420 slots = chip->num_slots; /* Quirk may have changed this */
1420 1421
1421 pci_enable_msi(pdev); 1422 if (!(chip->quirks2 & SDHCI_QUIRK2_BROKEN_MSI))
1423 pci_enable_msi(pdev);
1422 1424
1423 for (i = 0; i < slots; i++) { 1425 for (i = 0; i < slots; i++) {
1424 slot = sdhci_pci_probe_slot(pdev, chip, first_bar, i); 1426 slot = sdhci_pci_probe_slot(pdev, chip, first_bar, i);