From: Fr?d?ric Bri?re <fbriere@fbriere.net>
Date: Wed, 11 Aug 2010 01:03:30 +0000 (-0700)
Subject: parport_serial: use the PCI IRQ if offered
X-Git-Tag: v2.6.36-rc1~113
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=832ccf6f44969b616b2aeea25276684cf104fa3b;p=~shefty%2Frdma-dev.git

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>
---

diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index 40e208d130f..f01e26440f1 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);