diff options
Diffstat (limited to 'arch/ia64/pci/pci.c')
| -rw-r--r-- | arch/ia64/pci/pci.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 89f957ca3eb2..64aff520b899 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
| @@ -320,9 +320,9 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data) | |||
| 320 | static void __devinit | 320 | static void __devinit |
| 321 | pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl) | 321 | pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl) |
| 322 | { | 322 | { |
| 323 | int i, j; | 323 | int i; |
| 324 | 324 | ||
| 325 | j = 0; | 325 | pci_bus_remove_resources(bus); |
| 326 | for (i = 0; i < ctrl->windows; i++) { | 326 | for (i = 0; i < ctrl->windows; i++) { |
| 327 | struct resource *res = &ctrl->window[i].resource; | 327 | struct resource *res = &ctrl->window[i].resource; |
| 328 | /* HP's firmware has a hack to work around a Windows bug. | 328 | /* HP's firmware has a hack to work around a Windows bug. |
| @@ -330,13 +330,7 @@ pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl) | |||
| 330 | if ((res->flags & IORESOURCE_MEM) && | 330 | if ((res->flags & IORESOURCE_MEM) && |
| 331 | (res->end - res->start < 16)) | 331 | (res->end - res->start < 16)) |
| 332 | continue; | 332 | continue; |
| 333 | if (j >= PCI_BUS_NUM_RESOURCES) { | 333 | pci_bus_add_resource(bus, res, 0); |
| 334 | dev_warn(&bus->dev, | ||
| 335 | "ignoring host bridge window %pR (no space)\n", | ||
| 336 | res); | ||
| 337 | continue; | ||
| 338 | } | ||
| 339 | bus->resource[j++] = res; | ||
| 340 | } | 334 | } |
| 341 | } | 335 | } |
| 342 | 336 | ||
