From: Pierre Ossman <drzeus@drzeus.cx>
Date: Tue, 30 Jan 2007 06:55:15 +0000 (+0100)
Subject: mmc: handle pci_enable_device() return value in sdhci
X-Git-Tag: v2.6.21-rc1~92^2~40^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df1c4b7bf7f3b3a48d78c6e5c2fc5b9a1c01b821;p=linux-2.6

mmc: handle pci_enable_device() return value in sdhci

Make sure we report back any errors from pci_enable_device().

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
---

diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 99f1db9229..b57393c7f9 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -1125,7 +1125,9 @@ static int sdhci_resume (struct pci_dev *pdev)
 
 	pci_set_power_state(pdev, PCI_D0);
 	pci_restore_state(pdev);
-	pci_enable_device(pdev);
+	ret = pci_enable_device(pdev);
+	if (ret)
+		return ret;
 
 	for (i = 0;i < chip->num_slots;i++) {
 		if (!chip->hosts[i])