Merge branch 'master' of git://git.denx.de/u-boot-mmc

[u-boot] / drivers / mmc / pci_mmc.c

diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c
index 5fb71518c4d819a5029c9ec53b40b2cfc0cdbd01..e39b476834e650d187cfa25278ac48e7cfe87232 100644 (file)
--- a/drivers/mmc/pci_mmc.c
+++ b/drivers/mmc/pci_mmc.c
@@ -28,10 +28,11 @@ int pci_mmc_init(const char *name, struct pci_device_id *mmc_supported)
                if (!mmc_host)
                        return -ENOMEM;
 
-               mmc_host->name = (char *)name;
+               mmc_host->name = name;
                dm_pci_read_config32(dev, PCI_BASE_ADDRESS_0, &iobase);
-               mmc_host->ioaddr = (void *)iobase;
+               mmc_host->ioaddr = (void *)(ulong)iobase;
                mmc_host->quirks = 0;
+               mmc_host->max_clk = 0;
                ret = add_sdhci(mmc_host, 0, 0);
                if (ret)
                        return ret;