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

• Lines: 59
• Date: Tue Aug 26 14:52:44 1997
• Orig file: v2.1.51/linux/drivers/misc/parport_share.c
• Orig date: Mon Aug 4 16:25:37 1997

diff -u --recursive --new-file v2.1.51/linux/drivers/misc/parport_share.c linux/drivers/misc/parport_share.c
@@ -1,8 +1,7 @@
-/* $Id: parport_share.c,v 1.1.2.2 1997/04/18 15:00:52 phil Exp $
- * Parallel-port resource manager code.
+/* Parallel-port resource manager code.
  * 
  * Authors: David Campbell <campbell@tirian.che.curtin.edu.au>
- *          Tim Waugh <tmw20@cam.ac.uk>
+ *          Tim Waugh <tim@cyberelk.demon.co.uk>
  *	    Jose Renau <renau@acm.org>
  *
  * based on work by Grant Guenther <grant@torque.net>
@@ -19,6 +18,10 @@
 #include <linux/kernel.h>
 #include <linux/malloc.h>
 
+#ifdef CONFIG_KERNELD
+#include <linux/kerneld.h>
+#endif
+
 #undef PARPORT_PARANOID
 
 static struct parport *portlist = NULL, *portlist_tail = NULL;
@@ -27,6 +30,10 @@
 /* Return a list of all the ports we know about. */
 struct parport *parport_enumerate(void)
 {
+#ifdef CONFIG_KERNELD
+	if (portlist == NULL)
+		request_module("parport_lowlevel");
+#endif
 	return portlist;
 }
 
@@ -93,7 +100,8 @@
 	struct parport *p;
 	kfree(port->name);
 	if (portlist == port) {
-		portlist = port->next;
+		if ((portlist = port->next) == NULL)
+			portlist_tail = NULL;
 	} else {
 		for (p = portlist; (p != NULL) && (p->next != port); 
 		     p=p->next);
@@ -184,6 +192,7 @@
 		port->lurker = tmp;
 
 	inc_parport_count();
+	port->ops->inc_use_count();
 
 	return tmp;
 }
@@ -218,6 +227,7 @@
 	kfree(dev);
 
 	dec_parport_count();
+	port->ops->dec_use_count();
 
 	/* If there are no more devices, put the port to sleep. */
 	if (!port->devices)