patch-2.3.6 linux/drivers/usb/keyboard.c

• Lines: 34
• Date: Tue Jun 8 10:52:26 1999
• Orig file: v2.3.5/linux/drivers/usb/keyboard.c
• Orig date: Mon May 31 22:28:06 1999

diff -u --recursive --new-file v2.3.5/linux/drivers/usb/keyboard.c linux/drivers/usb/keyboard.c
@@ -56,10 +56,12 @@
     int scancode = (int) usb_kbd_map[key];
     if(scancode)
     {
+#ifndef CONFIG_MAC_KEYBOARD
         if(scancode & PCKBD_NEEDS_E0)
         {
             handle_scancode(0xe0, 1);
         }
+#endif /* CONFIG_MAC_KEYBOARD */
         handle_scancode((scancode & ~PCKBD_NEEDS_E0), down);
     }
 }
@@ -171,7 +173,10 @@
     struct usb_endpoint_descriptor *endpoint;
     struct usb_keyboard *kbd;
 
-    interface = &dev->config[0].interface[0];
+    if (dev->descriptor.bNumConfigurations < 1)
+	return -1;
+
+    interface = &dev->config[0].altsetting[0].interface[0];
     endpoint = &interface->endpoint[0];
 
     if(interface->bInterfaceClass != 3
@@ -233,7 +238,7 @@
 	return usb_kbd_init();
 }
 
-void module_cleanup(void)
+void cleanup_module(void)
 {
 	usb_deregister(&usb_kbd_driver);
 }