Skip to content

Commit

Permalink
parport: Fix various uses of parport_pc
Browse files Browse the repository at this point in the history
These got overlooked first time around.

Signed-off-by: Alan Cox <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Alan-Cox authored and torvalds committed Apr 14, 2009
1 parent cf54509 commit 28783eb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
5 changes: 3 additions & 2 deletions arch/sparc/include/asm/parport.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id
if (!strcmp(parent->name, "dma")) {
p = parport_pc_probe_port(base, base + 0x400,
op->irqs[0], PARPORT_DMA_NOFIFO,
op->dev.parent->parent);
op->dev.parent->parent, 0);
if (!p)
return -ENOMEM;
dev_set_drvdata(&op->dev, p);
Expand Down Expand Up @@ -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,
op->irqs[0],
slot,
op->dev.parent);
op->dev.parent,
0);
err = -ENOMEM;
if (!p)
goto out_disable_irq;
Expand Down
3 changes: 2 additions & 1 deletion drivers/parisc/superio.c
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,8 @@ static void __init superio_parport_init(void)
0 /*base_hi*/,
PAR_IRQ,
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");
#endif /* CONFIG_PARPORT_PC */
Expand Down

0 comments on commit 28783eb

Please sign in to comment.