Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7da5d406 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

[PATCH] i386/x86_64: FIX pci_enable_irq to set dev->irq to the irq number 



In commit ace80ab7 I removed the weird
logic that used the vector number as the irq number when MSI was
defined.  However pci_enable_irq was using a different test in the
io_apic_assign_irqs path and I missed it :(

This patch removes the wrong code so no one hits this problem.

This code is only active when a specific set of boot command line
parameters is specified which likely explains why no one has notices
this earlier.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ca4aa096

arch/i386/pci/irq.c

+0 −4
Original line number Diff line number Diff line
@@ -1141,10 +1141,6 @@ static int pirq_enable_irq(struct pci_dev *dev) 
			}

			dev = temp_dev;

			if (irq >= 0) {

#ifdef CONFIG_PCI_MSI

				if (!platform_legacy_irq(irq))

					irq = IO_APIC_VECTOR(irq);

#endif

				printk(KERN_INFO "PCI->APIC IRQ transform: %s[%c] -> IRQ %d\n",

					pci_name(dev), 'A' + pin, irq);

				dev->irq = irq;