patch-2.3.99-pre9 linux/drivers/macintosh/adb.c

• Lines: 20
• Date: Sat May 20 12:07:56 2000
• Orig file: v2.3.99-pre8/linux/drivers/macintosh/adb.c
• Orig date: Wed Feb 16 17:03:52 2000

diff -u --recursive --new-file v2.3.99-pre8/linux/drivers/macintosh/adb.c linux/drivers/macintosh/adb.c
@@ -72,6 +72,7 @@
 struct adb_driver *adb_controller;
 struct notifier_block *adb_client_list = NULL;
 static int adb_got_sleep = 0;
+static int adb_inited = 0;
 
 #ifdef CONFIG_PMAC_PBOOK
 static int adb_notify_sleep(struct pmu_sleep_notifier *self, int when);
@@ -213,6 +214,11 @@
 		return 0;
 #endif
 
+	/* xmon may do early-init */
+	if (adb_inited)
+		return 0;
+	adb_inited = 1;
+		
 	adb_controller = NULL;
 
 	i = 0;