diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-03-05 00:31:22 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-05 21:25:40 +0000 |
| commit | 7a171cdcb6ce82cc5e4bd7cb8eab172a43395f87 (patch) | |
| tree | 7e06a79a43ca2a5e8d57d88b80c6ac2b1e72f246 /drivers/parport | |
| parent | 501f74f29498543c27f4f9697f5c1e980dd2de0d (diff) | |
| download | kernel_goldelico_gta04-7a171cdcb6ce82cc5e4bd7cb8eab172a43395f87.zip kernel_goldelico_gta04-7a171cdcb6ce82cc5e4bd7cb8eab172a43395f87.tar.gz kernel_goldelico_gta04-7a171cdcb6ce82cc5e4bd7cb8eab172a43395f87.tar.bz2 | |
[SERIAL] Fix two bugs in parport_serial
Steinar H. Gunderson reported:
- For some reason, it detects the 9845 as a 9735 -- it appears this is
simply related to the ordering in parport_serial_pci_tbl[]. If we move
the 9845 up above the 9735, it prints out 9710:9845, but no change in
behaviour. (We didn't find out why this was the case; we left it alone
since it didn't affect our problem.)
- The card has no parallel port (at least no physical ones), yet it reports
(via its subsystem ID of 0x0014) one parallel port and four serial ports.
The probe for the parallel port fails, and the driver just aborts. Thus,
it doesn't find the serial ports.
Fix the debugging code to use dev_dbg, but don't bother displaying the
PCI ID of the detected board (that's accessible via other means.)
Also, arrange for parport_register() to return 0 even if it finds no
ports.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/parport')
| -rw-r--r-- | drivers/parport/parport_serial.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c index 166de35..1084525 100644 --- a/drivers/parport/parport_serial.c +++ b/drivers/parport/parport_serial.c @@ -312,8 +312,7 @@ static int __devinit parport_register (struct pci_dev *dev, { struct parport_pc_pci *card; struct parport_serial_private *priv = pci_get_drvdata (dev); - int i = id->driver_data, n; - int success = 0; + int n, success = 0; priv->par = cards[id->driver_data]; card = &priv->par; @@ -344,10 +343,8 @@ static int __devinit parport_register (struct pci_dev *dev, "hi" as an offset (see SYBA def.) */ /* TODO: test if sharing interrupts works */ - printk (KERN_DEBUG "PCI parallel port detected: %04x:%04x, " - "I/O at %#lx(%#lx)\n", - parport_serial_pci_tbl[i].vendor, - parport_serial_pci_tbl[i].device, io_lo, io_hi); + dev_dbg(&dev->dev, "PCI parallel port detected: I/O at " + "%#lx(%#lx)\n", io_lo, io_hi); port = parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE, PARPORT_DMA_NONE, dev); if (port) { @@ -359,7 +356,7 @@ static int __devinit parport_register (struct pci_dev *dev, if (card->postinit_hook) card->postinit_hook (dev, card, !success); - return success ? 0 : 1; + return 0; } static int __devinit parport_serial_pci_probe (struct pci_dev *dev, |