aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlexander Stein <alexander.stein@systec-electronic.com>2012-03-13 13:16:40 -0400
committerChris Ball <cjb@laptop.org>2012-03-27 12:20:12 -0400
commite6039832bed9a9b967796d7021f17f25b625b616 (patch)
tree5199be15437e7e4bfc96a2b8af4549a1826b709a /drivers
parent2378975bd5ed583da555c7e5dee121663b7d5f46 (diff)
mmc: sdhci-pci: Add MSI support
Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/sdhci-pci.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 3cb9abf67d82..bc666a4ed604 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -1385,6 +1385,8 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev,
1385 1385
1386 slots = chip->num_slots; /* Quirk may have changed this */ 1386 slots = chip->num_slots; /* Quirk may have changed this */
1387 1387
1388 pci_enable_msi(pdev);
1389
1388 for (i = 0; i < slots; i++) { 1390 for (i = 0; i < slots; i++) {
1389 slot = sdhci_pci_probe_slot(pdev, chip, first_bar, i); 1391 slot = sdhci_pci_probe_slot(pdev, chip, first_bar, i);
1390 if (IS_ERR(slot)) { 1392 if (IS_ERR(slot)) {
@@ -1403,6 +1405,8 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev,
1403 return 0; 1405 return 0;
1404 1406
1405free: 1407free:
1408 pci_disable_msi(pdev);
1409
1406 pci_set_drvdata(pdev, NULL); 1410 pci_set_drvdata(pdev, NULL);
1407 kfree(chip); 1411 kfree(chip);
1408 1412
@@ -1425,6 +1429,8 @@ static void __devexit sdhci_pci_remove(struct pci_dev *pdev)
1425 for (i = 0; i < chip->num_slots; i++) 1429 for (i = 0; i < chip->num_slots; i++)
1426 sdhci_pci_remove_slot(chip->slots[i]); 1430 sdhci_pci_remove_slot(chip->slots[i]);
1427 1431
1432 pci_disable_msi(pdev);
1433
1428 pci_set_drvdata(pdev, NULL); 1434 pci_set_drvdata(pdev, NULL);
1429 kfree(chip); 1435 kfree(chip);
1430 } 1436 }