leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parport: parport_pc: fix id print of a device

Browse Source 
Since commit 7106b4e3 ("8250: Oxford Semiconductor Devices") the debug
print of the device id does no longer match the real device if it is
located in the "enum" behind oxsemi_pcie_pport. The reason is that the
code assumes that each id contains one entry in the PCI table.
The fix is to lookup the currently used id from the id-> parameter.

Cc: Lee Howard <lee.howard@mainpine.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sebastian Andrzej Siewior 2013-12-04 21:08:55 +01:00 committed by Greg Kroah-Hartman
parent 4455d9fd48
commit 3f6e48597b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/parport/parport_pc.c
View File

@ -2827,16 +2827,12 @@ static int parport_pc_pci_probe(struct pci_dev *dev,
if (irq == IRQ_NONE) { if (irq == IRQ_NONE) {
printk(KERN_DEBUG printk(KERN_DEBUG
"PCI parallel port detected: %04x:%04x, I/O at %#lx(%#lx)\n", "PCI parallel port detected: %04x:%04x, I/O at %#lx(%#lx)\n",
parport_pc_pci_tbl[i + last_sio].vendor, id->vendor, id->device, io_lo, io_hi);
parport_pc_pci_tbl[i + last_sio].device,
io_lo, io_hi);
irq = PARPORT_IRQ_NONE; irq = PARPORT_IRQ_NONE;
} else { } else {
printk(KERN_DEBUG printk(KERN_DEBUG
"PCI parallel port detected: %04x:%04x, I/O at %#lx(%#lx), IRQ %d\n", "PCI parallel port detected: %04x:%04x, I/O at %#lx(%#lx), IRQ %d\n",
parport_pc_pci_tbl[i + last_sio].vendor, id->vendor, id->device, io_lo, io_hi, irq);
parport_pc_pci_tbl[i + last_sio].device,
io_lo, io_hi, irq);
} }
data->ports[count] = data->ports[count] =
parport_pc_probe_port(io_lo, io_hi, irq, parport_pc_probe_port(io_lo, io_hi, irq,