Merge tag 'pm+acpi-fixes-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / mmc / host / dw_mmc-pci.c

diff --git a/drivers/mmc/host/dw_mmc-pci.c b/drivers/mmc/host/dw_mmc-pci.c
index b456b0c3523140d9763b0e84e9ca55eccf385a62..f70546a3a7ccd33ac893d4b7734db90abbcbe3dc 100644 (file)
--- a/drivers/mmc/host/dw_mmc-pci.c
+++ b/drivers/mmc/host/dw_mmc-pci.c
@@ -59,7 +59,9 @@ static int dw_mci_pci_probe(struct pci_dev *pdev,
        if (ret)
                return ret;
 
-       host->regs = pcim_iomap_table(pdev)[0];
+       host->regs = pcim_iomap_table(pdev)[PCI_BAR_NO];
+
+       pci_set_master(pdev);
 
        ret = dw_mci_probe(host);
        if (ret)