Commit 37bfdbc1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents cd5a0afb a154f141

drivers/pci/setup-bus.c

+3 −2
Original line number Diff line number Diff line
@@ -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