diff options
Diffstat (limited to 'arch/x86/pci/acpi.c')
| -rw-r--r-- | arch/x86/pci/acpi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index b30e937689d6..7fb24e53d4c8 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c | |||
| @@ -354,12 +354,12 @@ static void coalesce_windows(struct pci_root_info *info, unsigned long type) | |||
| 354 | * the kernel resource tree doesn't allow overlaps. | 354 | * the kernel resource tree doesn't allow overlaps. |
| 355 | */ | 355 | */ |
| 356 | if (resource_overlaps(res1, res2)) { | 356 | if (resource_overlaps(res1, res2)) { |
| 357 | res1->start = min(res1->start, res2->start); | 357 | res2->start = min(res1->start, res2->start); |
| 358 | res1->end = max(res1->end, res2->end); | 358 | res2->end = max(res1->end, res2->end); |
| 359 | dev_info(&info->bridge->dev, | 359 | dev_info(&info->bridge->dev, |
| 360 | "host bridge window expanded to %pR; %pR ignored\n", | 360 | "host bridge window expanded to %pR; %pR ignored\n", |
| 361 | res1, res2); | 361 | res2, res1); |
| 362 | res2->flags = 0; | 362 | res1->flags = 0; |
| 363 | } | 363 | } |
| 364 | } | 364 | } |
| 365 | } | 365 | } |
