summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2007-01-30 07:55:15 +0100
committerPierre Ossman <drzeus@drzeus.cx>2007-02-04 20:54:11 +0100
commitdf1c4b7bf7f3b3a48d78c6e5c2fc5b9a1c01b821 (patch)
tree97949c48e76c6fccf7ed7d5a1d33b55c551ef5b0 /drivers/mmc
parent397411e67ff473c36161d93e4c7ac6dc53e23503 (diff)
downloadlinux-df1c4b7bf7f3b3a48d78c6e5c2fc5b9a1c01b821.tar.gz
linux-df1c4b7bf7f3b3a48d78c6e5c2fc5b9a1c01b821.tar.bz2
linux-df1c4b7bf7f3b3a48d78c6e5c2fc5b9a1c01b821.zip
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>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/sdhci.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 99f1db92295b..b57393c7f9b5 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])