patch-2.4.7 linux/drivers/parport/parport_pc.c

• Lines: 20
• Date: Tue Jul 10 16:07:46 2001
• Orig file: v2.4.6/linux/drivers/parport/parport_pc.c
• Orig date: Tue Jul 3 17:08:20 2001

diff -u --recursive --new-file v2.4.6/linux/drivers/parport/parport_pc.c linux/drivers/parport/parport_pc.c
@@ -2824,7 +2824,8 @@
 		/* Only probe the ports we were given. */
 		user_specified = 1;
 		do {
-			if (!*io_hi) *io_hi = 0x400 + *io;
+			if ((*io_hi) == PARPORT_IOHI_AUTO)
+			       *io_hi = 0x400 + *io;
 			if (parport_pc_probe_port(*(io++), *(io_hi++),
 						  *(irq++), *(dma++), NULL))
 				count++;
@@ -2842,7 +2843,8 @@
 
 #ifdef MODULE
 static int io[PARPORT_PC_MAX_PORTS+1] = { [0 ... PARPORT_PC_MAX_PORTS] = 0 };
-static int io_hi[PARPORT_PC_MAX_PORTS+1] = { [0 ... PARPORT_PC_MAX_PORTS] = 0 };
+static int io_hi[PARPORT_PC_MAX_PORTS+1] =
+	{ [0 ... PARPORT_PC_MAX_PORTS] = PARPORT_IOHI_AUTO };
 static int dmaval[PARPORT_PC_MAX_PORTS] = { [0 ... PARPORT_PC_MAX_PORTS-1] = PARPORT_DMA_AUTO };
 static int irqval[PARPORT_PC_MAX_PORTS] = { [0 ... PARPORT_PC_MAX_PORTS-1] = PARPORT_IRQ_PROBEONLY };
 static const char *irq[PARPORT_PC_MAX_PORTS] = { NULL, };