iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "mmc: sdhci-pci: Add MSI support"

Browse Source 
This reverts commit e6039832be.
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>
This commit is contained in:
Chris Ball 2012-04-03 16:48:32 -04:00
parent 84e41d2d56
commit 79263f33b0
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mmc/host/sdhci-pci.c
View File

@ -1418,8 +1418,6 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev,
slots = chip->num_slots; /* Quirk may have changed this */ slots = chip->num_slots; /* Quirk may have changed this */
pci_enable_msi(pdev);
for (i = 0; i < slots; i++) { for (i = 0; i < slots; i++) {
slot = sdhci_pci_probe_slot(pdev, chip, first_bar, i); slot = sdhci_pci_probe_slot(pdev, chip, first_bar, i);
if (IS_ERR(slot)) { if (IS_ERR(slot)) {
@ -1438,8 +1436,6 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev,
return 0; return 0;
free: free:
pci_disable_msi(pdev);
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
kfree(chip); kfree(chip);
@ -1462,8 +1458,6 @@ static void __devexit sdhci_pci_remove(struct pci_dev *pdev)
for (i = 0; i < chip->num_slots; i++) for (i = 0; i < chip->num_slots; i++)
sdhci_pci_remove_slot(chip->slots[i]); sdhci_pci_remove_slot(chip->slots[i]);
pci_disable_msi(pdev);
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
kfree(chip); kfree(chip);
} }