diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-08 18:51:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-08 18:51:00 -0700 |
| commit | 37bfdbc11b245119210ac9924a192aec8bd07d16 (patch) | |
| tree | 70e002a150d577a3732aab9f2128bcd63874794c | |
| parent | cd5a0afbdf8033dc83786315d63f8b325bdba2fd (diff) | |
| parent | a154f141604acacc0ec64a445d8058a045c308ef (diff) | |
Merge tag 'pci-v6.18-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
Pull pci fix from Bjorn Helgaas:
- Fix a resource lookup regression that broke enumeration of hotplugged
Thunderbolt devices on several platforms (Yangyu Chen)
* tag 'pci-v6.18-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
PCI: Fix regression in pci_bus_distribute_available_resources()
| -rw-r--r-- | drivers/pci/setup-bus.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 362ad108794d..4a8735b275e4 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -2085,7 +2085,8 @@ static void pci_bus_distribute_available_resources(struct pci_bus *bus, int i; for (i = 0; i < PCI_P2P_BRIDGE_RESOURCE_NUM; i++) { - struct resource *res = pci_bus_resource_n(bus, i); + struct resource *res = + pci_resource_n(bridge, PCI_BRIDGE_RESOURCES + i); available[i] = available_in[i]; @@ -2158,7 +2159,7 @@ static void pci_bus_distribute_available_resources(struct pci_bus *bus, continue; for (i = 0; i < PCI_P2P_BRIDGE_RESOURCE_NUM; i++) { - res = pci_bus_resource_n(bus, i); + res = pci_resource_n(dev, PCI_BRIDGE_RESOURCES + i); /* * Make sure the split resource space is properly |