Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[pandora-kernel.git] / drivers / mmc / host / sdhci-pci.c

diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 2f8d468..f8b5f37 100644 (file)
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -957,6 +957,7 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot(
        host->ioaddr = pci_ioremap_bar(pdev, bar);
        if (!host->ioaddr) {
                dev_err(&pdev->dev, "failed to remap registers\n");
+               ret = -ENOMEM;
                goto release;
        }
 
@@ -1016,16 +1017,14 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev,
        struct sdhci_pci_chip *chip;
        struct sdhci_pci_slot *slot;
 
-       u8 slots, rev, first_bar;
+       u8 slots, first_bar;
        int ret, i;
 
        BUG_ON(pdev == NULL);
        BUG_ON(ent == NULL);
 
-       pci_read_config_byte(pdev, PCI_CLASS_REVISION, &rev);
-
        dev_info(&pdev->dev, "SDHCI controller found [%04x:%04x] (rev %x)\n",
-                (int)pdev->vendor, (int)pdev->device, (int)rev);
+                (int)pdev->vendor, (int)pdev->device, (int)pdev->revision);
 
        ret = pci_read_config_byte(pdev, PCI_SLOT_INFO, &slots);
        if (ret)