Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/sparc/include/asm/parport.h

+3 −2
Original line number Diff line number Diff line
@@ -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);
@@ -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;

drivers/parisc/superio.c

+2 −1
Original line number Diff line number Diff line
@@ -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 */