From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kenji Kaneshige Subject: [PATCH 5/8] PCI: fix wrong assumption in pci_find_upstream_pcie_bridge Date: Wed, 28 Jan 2009 20:56:22 +0900 Message-ID: <498047E6.4070605@jp.fujitsu.com> References: <1231604250.3642.33.camel@localhost.localdomain> <1231807693.27151.21.camel@localhost.localdomain> <1232046108.5966.57.camel@localhost.localdomain> <1232049269.5966.64.camel@localhost.localdomain> <1232050347.5966.66.camel@localhost.localdomain> <4970242C.4010404@jp.fujitsu.com> <1232115546.3224.5.camel@localhost.localdomain> <4973D2EE.3060203@jp.fujitsu.com> <1232328216.3247.68.camel@localhost.localdomain> <4973EF64.2050404@jp.fujitsu.com> <1232558780.736.24.camel@localhost.localdomain> <497D1BD7.9000609@jp.fujitsu.com> <498045D1.60005@jp.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <498045D1.60005@jp.fujitsu.com> Sender: linux-pci-owner@vger.kernel.org To: linux-pci@vger.kernel.org, "Barnes, Jesse" Cc: James Bottomley , Len Brown , linux-acpi@vger.kernel.org, linux-kernel , shaohua.li@intel.com, Grant Grundler List-Id: linux-acpi@vger.kernel.org Current pci_find_upstream_pcie_bridge() has a wrong assumption that pci_bus->self is NULL on the root pci bus. But it might not true on some platforms. Because of this wrong assumption, current pci_find_upstream_pcie_bridge() might cause endless loop. We must check pci_bus->parent instead. Signed-off-by: Kenji Kaneshige --- drivers/pci/search.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6.29-rc2/drivers/pci/search.c =================================================================== --- linux-2.6.29-rc2.orig/drivers/pci/search.c +++ linux-2.6.29-rc2/drivers/pci/search.c @@ -29,7 +29,7 @@ pci_find_upstream_pcie_bridge(struct pci if (pdev->is_pcie) return NULL; while (1) { - if (!pdev->bus->self) + if (!pdev->bus->parent) break; pdev = pdev->bus->self; /* a p2p bridge */