diff options
| author | Christoph Biedl <linux-kernel.bfrz@manchmal.in-ulm.de> | 2015-12-23 16:51:57 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-02-09 22:56:21 -0500 |
| commit | 99b533235bc1b3d4ffda9fc91acec2e9b6f8e671 (patch) | |
| tree | 7bf7749d47f867980bc68d6769f7aab4c85fc51f /drivers | |
| parent | aefd4d23b58c5c30d84b1df15dff155520b6be4f (diff) | |
| download | linux-stable-99b533235bc1b3d4ffda9fc91acec2e9b6f8e671.tar.gz linux-stable-99b533235bc1b3d4ffda9fc91acec2e9b6f8e671.tar.bz2 linux-stable-99b533235bc1b3d4ffda9fc91acec2e9b6f8e671.zip | |
PCI: Fix minimum allocation address overwrite
[ Upstream commit 3460baa620685c20f5ee19afb6d99d26150c382c ]
Commit 36e097a8a297 ("PCI: Split out bridge window override of minimum
allocation address") claimed to do no functional changes but unfortunately
did: The "min" variable is altered. At least the AVM A1 PCMCIA adapter was
no longer detected, breaking ISDN operation.
Use a local copy of "min" to restore the previous behaviour.
[bhelgaas: avoid gcc "?:" extension for portability and readability]
Fixes: 36e097a8a297 ("PCI: Split out bridge window override of minimum allocation address")
Signed-off-by: Christoph Biedl <linux-kernel.bfrz@manchmal.in-ulm.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: stable@vger.kernel.org # v3.14+
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/bus.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 8fb16188cd82..8ca17ace1519 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -146,6 +146,8 @@ static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res, type_mask |= IORESOURCE_TYPE_BITS; pci_bus_for_each_resource(bus, r, i) { + resource_size_t min_used = min; + if (!r) continue; @@ -169,12 +171,12 @@ static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res, * overrides "min". */ if (avail.start) - min = avail.start; + min_used = avail.start; max = avail.end; /* Ok, try it out.. */ - ret = allocate_resource(r, res, size, min, max, + ret = allocate_resource(r, res, size, min_used, max, align, alignf, alignf_data); if (ret == 0) return 0; |