---

yaml --- r: 39019 b: refs/heads/master c: f015c6c h: refs/heads/master i: 39017: d36a9d6 39015: 9ba6926 v: v3
git-mirror · Oct 5, 2006 · 0eb4fd0 · 0eb4fd0
1 parent c1285c5
commit 0eb4fd0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70d666d6ae9724c0a08434c20f8830c90a635bd3
+refs/heads/master: f015c6c4d733f68cbc1c5d231bb158abaa5c9606
diff --git a/trunk/arch/i386/pci/direct.c b/trunk/arch/i386/pci/direct.c
@@ -256,6 +256,8 @@ static int __init pci_check_type2(void)
 
 void __init pci_direct_init(int type)
 {
+	if (type == 0)
+		return;
 	printk(KERN_INFO "PCI: Using configuration type %d\n", type);
 	if (type == 1)
 		raw_pci_ops = &pci_direct_conf1;

diff --git a/trunk/arch/i386/pci/init.c b/trunk/arch/i386/pci/init.c
@@ -28,6 +28,10 @@ static __init int pci_access_init(void)
 #ifdef CONFIG_PCI_DIRECT
 	pci_direct_init(type);
 #endif
+	if (!raw_pci_ops)
+		printk(KERN_ERR
+		"PCI: Fatal: No config space access function found\n");
+
 	return 0;
 }
 arch_initcall(pci_access_init);