Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc76b731 authored by Yinghai Lu's avatar Yinghai Lu Committed by Bjorn Helgaas
Browse files

PCI: insert busn_res for child bus 



Now we can insert busn_res now, after all root bus's get inserted.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent b7eac055

drivers/pci/probe.c

+3 −2
Original line number Diff line number Diff line
@@ -755,7 +755,7 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, 
			if (!child)

				goto out;

			child->primary = primary;

			child->busn_res.end = subordinate;

			pci_bus_insert_busn_res(child, secondary, subordinate);

			child->bridge_ctl = bctl;

		}
@@ -793,6 +793,7 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, 
			child = pci_add_new_bus(bus, dev, ++max);

			if (!child)

				goto out;

			pci_bus_insert_busn_res(child, max, 0xff);

		}

		buses = (buses & 0xff000000)

		      | ((unsigned int)(child->primary)     <<  0)
@@ -864,7 +865,7 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, 
		/*

		 * Set the subordinate bus number to its real value.

		 */

		child->busn_res.end = max;

		pci_bus_update_busn_res_end(child, max);

		pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, max);

	}