patch-2.2.19 linux/drivers/char/misc.c

• Lines: 28
• Date: Sun Mar 25 11:37:31 2001
• Orig file: v2.2.18/drivers/char/misc.c
• Orig date: Sun Mar 25 11:28:23 2001

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.18/drivers/char/misc.c linux/drivers/char/misc.c
@@ -139,8 +139,17 @@
 
 int misc_register(struct miscdevice * misc)
 {
+	struct miscdevice *c;
+
 	if (misc->next || misc->prev)
 		return -EBUSY;
+	c = misc_list.next;
+
+	while ((c != &misc_list) && (c->minor != misc->minor))
+		c = c->next;
+	if (c != &misc_list)
+		return -EBUSY;
+
 	if (misc->minor == MISC_DYNAMIC_MINOR) {
 		int i = DYNAMIC_MINORS;
 		while (--i >= 0)
@@ -229,6 +238,9 @@
 #endif
 #ifdef CONFIG_ACQUIRE_WDT
 	acq_init();
+#endif
+#ifdef CONFIG_ADVANTECH_WDT
+	advwdt_init();
 #endif
 #ifdef CONFIG_60XX_WDT
 	sbc60xxwdt_init();