X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fx86_64%2Fkernel%2Fio_apic.c;h=f7625f3ee14565fd51686faf2ea37b86eafa0942;hb=78a6196531f0fe10aae05a9bc4c2701df614ac3d;hp=2fceed58836456955964327a46bbf4bd299656b6;hpb=86090fcac5e27b630656fe3d963a6b80e26dac44;p=linux-2.6.git diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c index 2fceed588..f7625f3ee 100644 --- a/arch/x86_64/kernel/io_apic.c +++ b/arch/x86_64/kernel/io_apic.c @@ -237,6 +237,7 @@ void __init check_ioapic(void) for (func = 0; func < 8; func++) { u32 class; u32 vendor; + u8 type; class = read_pci_config(num,slot,func, PCI_CLASS_REVISION); if (class == 0xffffffff) @@ -258,7 +259,7 @@ void __init check_ioapic(void) iommu_aperture_disabled = 1; } #endif - /* FALL THROUGH */ + return; case PCI_VENDOR_ID_NVIDIA: #ifndef CONFIG_SMP printk(KERN_INFO @@ -270,8 +271,8 @@ void __init check_ioapic(void) } /* No multi-function device? */ - u8 type = read_pci_config_byte(num,slot,func, - PCI_HEADER_TYPE); + type = read_pci_config_byte(num,slot,func, + PCI_HEADER_TYPE); if (!(type & 0x80)) break; }