pci: fix PCI bus allocation alignment handling

[pandora-kernel.git] / drivers / pci / setup-bus.c

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 89d0a6a..ebf51ad 100644 (file)
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -676,10 +676,10 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
                        min_align = align1 >> 1;
                align += aligns[order];
        }
-       size0 = calculate_memsize(size, min_size, 0, resource_size(b_res), align);
+       size0 = calculate_memsize(size, min_size, 0, resource_size(b_res), min_align);
        size1 = !add_size ? size :
                calculate_memsize(size, min_size+add_size, 0,
-                               resource_size(b_res), align);
+                               resource_size(b_res), min_align);
        if (!size0 && !size1) {
                if (b_res->start || b_res->end)
                        dev_info(&bus->self->dev, "disabling bridge window "