diff --git a/[refs] b/[refs] index 36e0ddf996da..0db6d012a9ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7ed538a02c219119adb20f1dccbf0f8015e53f3 +refs/heads/master: 688d191821de7893043f5a37970472627aaffa4e diff --git a/trunk/drivers/pci/bus.c b/trunk/drivers/pci/bus.c index fedae89d8f7d..fb9a11243d2a 100644 --- a/trunk/drivers/pci/bus.c +++ b/trunk/drivers/pci/bus.c @@ -60,7 +60,9 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, continue; /* Ok, try it out.. */ - ret = allocate_resource(r, res, size, min, -1, align, + ret = allocate_resource(r, res, size, + r->start ? : min, + -1, align, alignf, alignf_data); if (ret == 0) break;