summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorFr?d?ric Bri?re <fbriere@fbriere.net>2010-08-10 18:03:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-11 08:59:22 -0700
commit832ccf6f44969b616b2aeea25276684cf104fa3b (patch)
tree2aa3c7022469cd37340e4f17d092942e33d889ed /drivers
parent863a6049202412a6d655d052eb1c45ca7dd74a83 (diff)
downloadlinux-832ccf6f44969b616b2aeea25276684cf104fa3b.tar.bz2
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 <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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/parport/parport_serial.c1
1 files changed, 0 insertions, 1 deletions
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);