Commit 193cac99 authored by Michael Neuling's avatar Michael Neuling Committed by Paul Mackerras
Browse files

[PATCH] powerpc: parallel port init fix 



This stops parport from accessing nonexistent parallel ports.

Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 296167ae

include/asm-powerpc/parport.h

+26 −2
Original line number Diff line number Diff line
@@ -10,10 +10,34 @@ 
#define _ASM_POWERPC_PARPORT_H

#ifdef __KERNEL__



static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma);

#include <asm/prom.h>



extern struct parport *parport_pc_probe_port (unsigned long int base,

                                              unsigned long int base_hi,

                                              int irq, int dma,

                                              struct pci_dev *dev);



static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma)

{

	return parport_pc_find_isa_ports (autoirq, autodma);

	struct device_node *np;

	u32 *prop;

	u32 io1, io2;

	int propsize;

	int count = 0;

	for (np = NULL; (np = of_find_compatible_node(np,

						      "parallel",

						      "pnpPNP,400")) != NULL;) {

		prop = (u32 *)get_property(np, "reg", &propsize);

		if (!prop || propsize > 6*sizeof(u32))

			continue;

		io1 = prop[1]; io2 = prop[2];

		prop = (u32 *)get_property(np, "interrupts", NULL);

		if (!prop)

			continue;

		if (parport_pc_probe_port(io1, io2, prop[0], autodma, NULL) != NULL)

			count++;

	}

	return count;

}



#endif /* __KERNEL__ */