Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[linux-2.6-microblaze.git] / drivers / bcma / driver_pci_host.c

diff --git a/drivers/bcma/driver_pci_host.c b/drivers/bcma/driver_pci_host.c
index d2097a1..b9a86ed 100644 (file)
--- a/drivers/bcma/driver_pci_host.c
+++ b/drivers/bcma/driver_pci_host.c
@@ -119,7 +119,7 @@ static int bcma_extpci_read_config(struct bcma_drv_pci *pc, unsigned int dev,
                if (unlikely(!addr))
                        goto out;
                err = -ENOMEM;
-               mmio = ioremap_nocache(addr, len);
+               mmio = ioremap_nocache(addr, sizeof(val));
                if (!mmio)
                        goto out;
 
@@ -171,7 +171,7 @@ static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev,
                        addr = pc->core->addr + BCMA_CORE_PCI_PCICFG0;
                        addr |= (func << 8);
                        addr |= (off & 0xfc);
-                       mmio = ioremap_nocache(addr, len);
+                       mmio = ioremap_nocache(addr, sizeof(val));
                        if (!mmio)
                                goto out;
                }
@@ -180,7 +180,7 @@ static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev,
                if (unlikely(!addr))
                        goto out;
                err = -ENOMEM;
-               mmio = ioremap_nocache(addr, len);
+               mmio = ioremap_nocache(addr, sizeof(val));
                if (!mmio)
                        goto out;
 
@@ -491,8 +491,8 @@ void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
        /* Ok, ready to run, register it to the system.
         * The following needs change, if we want to port hostmode
         * to non-MIPS platform. */
-       io_map_base = (unsigned long)ioremap_nocache(BCMA_SOC_PCI_MEM,
-                                                    0x04000000);
+       io_map_base = (unsigned long)ioremap_nocache(pc_host->mem_resource.start,
+                                                    resource_size(&pc_host->mem_resource));
        pc_host->pci_controller.io_map_base = io_map_base;
        set_io_port_base(pc_host->pci_controller.io_map_base);
        /* Give some time to the PCI controller to configure itself with the new