diff options
Diffstat (limited to 'drivers/pci/setup-bus.c')
-rw-r--r-- | drivers/pci/setup-bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index cb389277df41..958da7db9033 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c | |||
@@ -1066,10 +1066,10 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, | |||
1066 | r->flags = 0; | 1066 | r->flags = 0; |
1067 | continue; | 1067 | continue; |
1068 | } | 1068 | } |
1069 | size += r_size; | 1069 | size += max(r_size, align); |
1070 | /* Exclude ranges with size > align from | 1070 | /* Exclude ranges with size > align from |
1071 | calculation of the alignment. */ | 1071 | calculation of the alignment. */ |
1072 | if (r_size == align) | 1072 | if (r_size <= align) |
1073 | aligns[order] += align; | 1073 | aligns[order] += align; |
1074 | if (order > max_order) | 1074 | if (order > max_order) |
1075 | max_order = order; | 1075 | max_order = order; |