patch-2.3.99-pre9 linux/arch/i386/kernel/pci-irq.c

• Lines: 17
• Date: Sat May 13 07:34:49 2000
• Orig file: v2.3.99-pre8/linux/arch/i386/kernel/pci-irq.c
• Orig date: Thu May 11 15:30:06 2000

diff -u --recursive --new-file v2.3.99-pre8/linux/arch/i386/kernel/pci-irq.c linux/arch/i386/kernel/pci-irq.c
@@ -222,6 +222,7 @@
 	{ "PIIX", PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371FB_0, pirq_piix_get, pirq_piix_set },
 	{ "PIIX", PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371SB_0, pirq_piix_get, pirq_piix_set },
 	{ "PIIX", PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_0, pirq_piix_get, pirq_piix_set },
+	{ "PIIX", PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82440MX_1, pirq_piix_get, pirq_piix_set },
 	{ "ALI", PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, pirq_ali_get, pirq_ali_set },
 	{ "VIA", PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_0, pirq_via_get, pirq_via_set },
 	{ "VIA", PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C596, pirq_via_get, pirq_via_set },
@@ -345,7 +346,7 @@
 
 	if (!irq) {
 		DBG(" ... failed\n");
-		if (newirq && mask == (1 << newirq)) {
+		if (assign && newirq && mask == (1 << newirq)) {
 			msg = "Guessed";
 			irq = newirq;
 		} else