Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751294AbWHBRhD (ORCPT ); Wed, 2 Aug 2006 13:37:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751296AbWHBRhB (ORCPT ); Wed, 2 Aug 2006 13:37:01 -0400 Received: from mxout.hispeed.ch ([62.2.95.247]:27338 "EHLO smtp.hispeed.ch") by vger.kernel.org with ESMTP id S1751294AbWHBRhA (ORCPT ); Wed, 2 Aug 2006 13:37:00 -0400 From: Daniel Ritz To: Greg KH , Andrew Morton Subject: [PATCH] PCI: use PCI_BIOS as last fallback Date: Wed, 2 Aug 2006 19:36:40 +0200 User-Agent: KMail/1.7.2 Cc: "linux-kernel" , "linux-pci" , Marcus Better MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200608021936.41102.daniel.ritz-ml@swissonline.ch> X-DCC-spamcheck-01.tornado.cablecom.ch-Metrics: smtp-06.tornado.cablecom.ch 1377; Body=5 Fuz1=5 Fuz2=5 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1200 Lines: 38 [PATCH] PCI: use PCI_BIOS as last fallback there was a change in 2.6.17 which affected the order in which the PCI access methods are probed. this gives regressions on some machines with broken BIOS. the problem is that PCI_BIOS sometimes reports the last bus wrong, leaving cardbus non-funcational. previously those system worked fine with direct access. fix it by chaning the order of the probing, having PCI_BIOS as the last fallback. Signed-off-by: Daniel Ritz diff --git a/arch/i386/pci/init.c b/arch/i386/pci/init.c index c7650a7..caeefd4 100644 --- a/arch/i386/pci/init.c +++ b/arch/i386/pci/init.c @@ -11,13 +11,13 @@ #ifdef CONFIG_PCI_MMCONFIG #endif if (raw_pci_ops) return 0; -#ifdef CONFIG_PCI_BIOS - pci_pcbios_init(); -#endif - if (raw_pci_ops) - return 0; #ifdef CONFIG_PCI_DIRECT pci_direct_init(); + if (raw_pci_ops) + return 0; +#endif +#ifdef CONFIG_PCI_BIOS + pci_pcbios_init(); #endif return 0; } - 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/