From 832ccf6f44969b616b2aeea25276684cf104fa3b Mon Sep 17 00:00:00 2001 From: Fr?d?ric Bri?re Date: Tue, 10 Aug 2010 18:03:30 -0700 Subject: [PATCH] parport_serial: use the PCI IRQ if offered Commit 51dcdfe ("parport: Use the PCI IRQ if offered") added IRQ support for PCI parallel port devices handled by parport_pc, but turned it off for parport_serial, despite a printk() message to the contrary. Signed-off-by: Fr?d?ric Bri?re Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/parport/parport_serial.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c index 40e208d130f5..f01e26440f11 100644 --- a/drivers/parport/parport_serial.c +++ b/drivers/parport/parport_serial.c @@ -342,7 +342,6 @@ static int __devinit parport_register (struct pci_dev *dev, dev_dbg(&dev->dev, "PCI parallel port detected: I/O at %#lx(%#lx), IRQ %d\n", io_lo, io_hi, irq); - irq = PARPORT_IRQ_NONE; } port = parport_pc_probe_port (io_lo, io_hi, irq, PARPORT_DMA_NONE, &dev->dev, IRQF_SHARED);