From 00b60501d585a49cb01e8ce833c565861d9bce28 Mon Sep 17 00:00:00 2001 From: Alexander Stein Date: Tue, 13 Mar 2012 18:16:40 +0100 Subject: [PATCH] --- yaml --- r: 297355 b: refs/heads/master c: e6039832bed9a9b967796d7021f17f25b625b616 h: refs/heads/master i: 297353: 63ba72356d19c7fe7f276e8bb4ff366f5c23cc38 297351: 8bebfed5d0c6ee60bdd87d9ab5e7972ace7e6d68 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci-pci.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7221041e11ca..a75b66cf24b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2378975bd5ed583da555c7e5dee121663b7d5f46 +refs/heads/master: e6039832bed9a9b967796d7021f17f25b625b616 diff --git a/trunk/drivers/mmc/host/sdhci-pci.c b/trunk/drivers/mmc/host/sdhci-pci.c index 3cb9abf67d82..bc666a4ed604 100644 --- a/trunk/drivers/mmc/host/sdhci-pci.c +++ b/trunk/drivers/mmc/host/sdhci-pci.c @@ -1385,6 +1385,8 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev, slots = chip->num_slots; /* Quirk may have changed this */ + pci_enable_msi(pdev); + for (i = 0; i < slots; i++) { slot = sdhci_pci_probe_slot(pdev, chip, first_bar, i); if (IS_ERR(slot)) { @@ -1403,6 +1405,8 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev, return 0; free: + pci_disable_msi(pdev); + pci_set_drvdata(pdev, NULL); kfree(chip); @@ -1425,6 +1429,8 @@ static void __devexit sdhci_pci_remove(struct pci_dev *pdev) for (i = 0; i < chip->num_slots; i++) sdhci_pci_remove_slot(chip->slots[i]); + pci_disable_msi(pdev); + pci_set_drvdata(pdev, NULL); kfree(chip); }