parport_serial: use the PCI IRQ if offered
authorFr?d?ric Bri?re <fbriere@fbriere.net>
Wed, 11 Aug 2010 01:03:30 +0000 (18:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Aug 2010 15:59:22 +0000 (08:59 -0700)
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 <fbriere@fbriere.net>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/parport/parport_serial.c

index 40e208d130f5b8ccf5a6e95be316f8af7e35440a..f01e26440f1108b8d994f348a897c2fde3f8e96b 100644 (file)
@@ -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);