Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755558AbZA1MAZ (ORCPT ); Wed, 28 Jan 2009 07:00:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751988AbZA1MAJ (ORCPT ); Wed, 28 Jan 2009 07:00:09 -0500 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:37296 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751461AbZA1MAH (ORCPT ); Wed, 28 Jan 2009 07:00:07 -0500 Message-ID: <498048B6.20203@jp.fujitsu.com> Date: Wed, 28 Jan 2009 20:59:50 +0900 From: Kenji Kaneshige User-Agent: Thunderbird 2.0.0.19 (Windows/20081209) MIME-Version: 1.0 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 Subject: [PATCH 8/8] PCI: fix wrong assumption in pci_common_swizzle 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> In-Reply-To: <498045D1.60005@jp.fujitsu.com> Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1071 Lines: 30 Current pci_common_swizzle() seems to have a assumption that pci_bus->self is NULL on the pci root bus. But it might not be true on some platforms. Because of this wrong assumption, pci_common_swizzle() might cause endless loop. We must check pci_bus->parent instead. Signed-off-by: Kenji Kaneshige --- drivers/pci/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6.29-rc2/drivers/pci/pci.c =================================================================== --- linux-2.6.29-rc2.orig/drivers/pci/pci.c +++ linux-2.6.29-rc2/drivers/pci/pci.c @@ -1453,7 +1453,7 @@ u8 pci_common_swizzle(struct pci_dev *de { u8 pin = *pinp; - while (dev->bus->self) { + while (dev->bus->parent) { pin = pci_swizzle_interrupt_pin(dev, pin); dev = dev->bus->self; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/