Commit 28783eb5 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

parport: Fix various uses of parport_pc

These got overlooked first time around.
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cf545093
...@@ -117,7 +117,7 @@ static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id ...@@ -117,7 +117,7 @@ static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id
if (!strcmp(parent->name, "dma")) { if (!strcmp(parent->name, "dma")) {
p = parport_pc_probe_port(base, base + 0x400, p = parport_pc_probe_port(base, base + 0x400,
op->irqs[0], PARPORT_DMA_NOFIFO, op->irqs[0], PARPORT_DMA_NOFIFO,
op->dev.parent->parent); op->dev.parent->parent, 0);
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
dev_set_drvdata(&op->dev, p); dev_set_drvdata(&op->dev, p);
...@@ -168,7 +168,8 @@ static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id ...@@ -168,7 +168,8 @@ static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id
p = parport_pc_probe_port(base, base + 0x400, p = parport_pc_probe_port(base, base + 0x400,
op->irqs[0], op->irqs[0],
slot, slot,
op->dev.parent); op->dev.parent,
0);
err = -ENOMEM; err = -ENOMEM;
if (!p) if (!p)
goto out_disable_irq; goto out_disable_irq;
......
...@@ -434,7 +434,8 @@ static void __init superio_parport_init(void) ...@@ -434,7 +434,8 @@ static void __init superio_parport_init(void)
0 /*base_hi*/, 0 /*base_hi*/,
PAR_IRQ, PAR_IRQ,
PARPORT_DMA_NONE /* dma */, PARPORT_DMA_NONE /* dma */,
NULL /*struct pci_dev* */) ) NULL /*struct pci_dev* */),
0 /* shared irq flags */ )
printk(KERN_WARNING PFX "Probing parallel port failed.\n"); printk(KERN_WARNING PFX "Probing parallel port failed.\n");
#endif /* CONFIG_PARPORT_PC */ #endif /* CONFIG_PARPORT_PC */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment