patch-2.1.86 linux/drivers/char/lp.c

• Lines: 47
• Date: Mon Feb 9 11:33:10 1998
• Orig file: v2.1.85/linux/drivers/char/lp.c
• Orig date: Fri Jan 30 11:28:07 1998

diff -u --recursive --new-file v2.1.85/linux/drivers/char/lp.c linux/drivers/char/lp.c
@@ -305,6 +305,7 @@
 					}
 					current->timeout = jiffies + LP_TIMEOUT_INTERRUPT;
 					interruptible_sleep_on(&lp->dev->wait_q);
+					disable_irq(lp->dev->port->irq);
 					w_ctr(minor, LP_PSELECP | LP_PINITP);
 					sti();
 					if (lp_check_status(minor))
@@ -663,7 +664,7 @@
 	} else if (!strcmp(str, "auto")) {
 		parport[0] = LP_PARPORT_AUTO;
 	} else if (!strcmp(str, "none")) {
-		parport_ptr++;
+		parport[parport_ptr++] = LP_PARPORT_NONE;
 	} else if (!strcmp(str, "reset")) {
 		reset = 1;
 	} else {
@@ -701,6 +702,7 @@
 int lp_init(void)
 {
 	unsigned int count = 0;
+	unsigned int i;
 	struct parport *port;
 
 	switch (parport[0])
@@ -722,15 +724,17 @@
 		}
 		break;
 
+	case LP_PARPORT_NONE:
 	default:
-		for (count = 0; count < LP_NO; count++) {
-			if (parport[count] != LP_PARPORT_UNSPEC) {
+		for (i = 0; i < LP_NO; i++) {
+			if (parport[i] >= 0) {
 				char buffer[16];
-				sprintf(buffer, "parport%d", parport[count]);
+				sprintf(buffer, "parport%d", parport[i]);
 				for (port = parport_enumerate(); port; 
 				     port = port->next) {
 					if (!strcmp(port->name, buffer)) {
-						(void) lp_register(count, port);
+						(void) lp_register(i, port);
+						count++;
 						break;
 					}
 				}