From 613b039ea25685435717fbacbc7d887cc219a490 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Thu, 17 May 2012 18:51:12 -0700 Subject: [PATCH] --- yaml --- r: 316431 b: refs/heads/master c: 857c3b668ae35c48d9d7a4248b6c0bdb65797d0e h: refs/heads/master i: 316429: 77f0260475ed259e3cf9e1d7db5f502efb5226db 316427: dfac087cde32337f4adb5c711be6f7175b0b2a43 316423: aedaf495b3ad6febf0c26b2d71481b20bc8b5e2e 316415: e774075e3cc436cdbe2b549f4457baadb5d4d829 v: v3 --- [refs] | 2 +- trunk/drivers/pci/probe.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f74d6bfa3e21..416d30d6c8e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67cdc827286366acb6c60c821013c1185ee00b36 +refs/heads/master: 857c3b668ae35c48d9d7a4248b6c0bdb65797d0e diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c index 68e75cb0831b..9f68b9d3597c 100644 --- a/trunk/drivers/pci/probe.c +++ b/trunk/drivers/pci/probe.c @@ -1836,9 +1836,10 @@ struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, pci_add_resource(&resources, &ioport_resource); pci_add_resource(&resources, &iomem_resource); + pci_add_resource(&resources, &busn_resource); b = pci_create_root_bus(parent, bus, ops, sysdata, &resources); if (b) - b->busn_res.end = pci_scan_child_bus(b); + pci_scan_child_bus(b); else pci_free_resource_list(&resources); return b; @@ -1853,9 +1854,10 @@ struct pci_bus * __devinit pci_scan_bus(int bus, struct pci_ops *ops, pci_add_resource(&resources, &ioport_resource); pci_add_resource(&resources, &iomem_resource); + pci_add_resource(&resources, &busn_resource); b = pci_create_root_bus(NULL, bus, ops, sysdata, &resources); if (b) { - b->busn_res.end = pci_scan_child_bus(b); + pci_scan_child_bus(b); pci_bus_add_devices(b); } else { pci_free_resource_list(&resources);