diff options
| -rw-r--r-- | arch/x86/pci/acpi.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index a312e76063a7..daa42490c1d9 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c | |||
| @@ -404,7 +404,12 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root) | |||
| 404 | kfree(sd); | 404 | kfree(sd); |
| 405 | } else { | 405 | } else { |
| 406 | get_current_resources(device, busnum, domain, &resources); | 406 | get_current_resources(device, busnum, domain, &resources); |
| 407 | if (list_empty(&resources)) | 407 | |
| 408 | /* | ||
| 409 | * _CRS with no apertures is normal, so only fall back to | ||
| 410 | * defaults or native bridge info if we're ignoring _CRS. | ||
| 411 | */ | ||
| 412 | if (!pci_use_crs) | ||
| 408 | x86_pci_root_bus_resources(busnum, &resources); | 413 | x86_pci_root_bus_resources(busnum, &resources); |
| 409 | bus = pci_create_root_bus(NULL, busnum, &pci_root_ops, sd, | 414 | bus = pci_create_root_bus(NULL, busnum, &pci_root_ops, sd, |
| 410 | &resources); | 415 | &resources); |