diff options
-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 166de3507780..10845253c9e0 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, | |||
312 | { | 312 | { |
313 | struct parport_pc_pci *card; | 313 | struct parport_pc_pci *card; |
314 | struct parport_serial_private *priv = pci_get_drvdata (dev); | 314 | struct parport_serial_private *priv = pci_get_drvdata (dev); |
315 | int i = id->driver_data, n; | 315 | int n, success = 0; |
316 | int success = 0; | ||
317 | 316 | ||
318 | priv->par = cards[id->driver_data]; | 317 | priv->par = cards[id->driver_data]; |
319 | card = &priv->par; | 318 | card = &priv->par; |
@@ -344,10 +343,8 @@ static int __devinit parport_register (struct pci_dev *dev, | |||
344 | "hi" as an offset (see SYBA | 343 | "hi" as an offset (see SYBA |
345 | def.) */ | 344 | def.) */ |
346 | /* TODO: test if sharing interrupts works */ | 345 | /* TODO: test if sharing interrupts works */ |
347 | printk (KERN_DEBUG "PCI parallel port detected: %04x:%04x, " | 346 | dev_dbg(&dev->dev, "PCI parallel port detected: I/O at " |
348 | "I/O at %#lx(%#lx)\n", | 347 | "%#lx(%#lx)\n", io_lo, io_hi); |
349 | parport_serial_pci_tbl[i].vendor, | ||
350 | parport_serial_pci_tbl[i].device, io_lo, io_hi); | ||
351 | port = parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE, | 348 | port = parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE, |
352 | PARPORT_DMA_NONE, dev); | 349 | PARPORT_DMA_NONE, dev); |
353 | if (port) { | 350 | if (port) { |
@@ -359,7 +356,7 @@ static int __devinit parport_register (struct pci_dev *dev, | |||
359 | if (card->postinit_hook) | 356 | if (card->postinit_hook) |
360 | card->postinit_hook (dev, card, !success); | 357 | card->postinit_hook (dev, card, !success); |
361 | 358 | ||
362 | return success ? 0 : 1; | 359 | return 0; |
363 | } | 360 | } |
364 | 361 | ||
365 | static int __devinit parport_serial_pci_probe (struct pci_dev *dev, | 362 | static int __devinit parport_serial_pci_probe (struct pci_dev *dev, |