X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fpci%2Fbus.c;h=fb9a11243d2a1fbff876749a997617cfb4013670;hb=a8b3e6f10f08f66ae1072efd087b30966a3654f6;hp=fedae89d8f7d5678b7b7126a084b8a49a9939858;hpb=7e568e62e9d4674d487cdc11f369e49e56ce6703;p=linux-2.6 diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index fedae89d8f..fb9a11243d 100644 --- a/drivers/pci/bus.c +++ b/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;