patch-2.1.104 linux/drivers/misc/parport_share.c

• Lines: 66
• Date: Thu May 21 17:05:00 1998
• Orig file: v2.1.103/linux/drivers/misc/parport_share.c
• Orig date: Thu May 7 22:51:50 1998

diff -u --recursive --new-file v2.1.103/linux/drivers/misc/parport_share.c linux/drivers/misc/parport_share.c
@@ -37,7 +37,6 @@
 #define PARPORT_DEFAULT_TIMESLICE	(HZ/5)
 
 static struct parport *portlist = NULL, *portlist_tail = NULL;
-static int portcount = 0;
 
 void (*parport_probe_hook)(struct parport *port) = NULL;
 
@@ -67,6 +66,7 @@
 				      struct parport_operations *ops)
 {
 	struct parport *tmp;
+	int portnum;
 
 	/* Check for a previously registered port.
 	   NOTE: we will ignore irq and dma if we find a previously
@@ -82,6 +82,22 @@
 		return NULL;
 	}
 
+	/* Search for the lowest free parport number. */
+	for (portnum = 0; ; portnum++) {
+		struct parport *itr = portlist;
+		while (itr) {
+			if (itr->number == portnum)
+				/* No good, already used. */
+				break;
+			else
+				itr = itr->next;
+		}
+
+		if (itr == NULL)
+			/* Got to the end of the list. */
+			break;
+	}
+	
 	/* Init our structure */
  	memset(tmp, 0, sizeof(struct parport));
 	tmp->base = base;
@@ -92,7 +108,7 @@
 	tmp->devices = tmp->cad = NULL;
 	tmp->flags = 0;
 	tmp->ops = ops;
-	tmp->number = portcount;
+	tmp->number = portnum;
 	spin_lock_init (&tmp->lock);
 
 	tmp->name = kmalloc(15, GFP_KERNEL);
@@ -101,7 +117,7 @@
 		kfree(tmp);
 		return NULL;
 	}
-	sprintf(tmp->name, "parport%d", portcount);
+	sprintf(tmp->name, "parport%d", portnum);
 
 	/* Chain the entry to our list. */
 	if (portlist_tail)
@@ -109,8 +125,6 @@
 	portlist_tail = tmp;
 	if (!portlist)
 		portlist = tmp;
-
-	portcount++;
 
 	tmp->probe_info.class = PARPORT_CLASS_LEGACY;  /* assume the worst */
 	tmp->waithead = tmp->waittail = NULL;