Browse Source

usb: kbd: Remove check for already being registered

We now always properly deregister the keyboard before calling
drv_usb_kbd_init(), so we can drop the check for already being registered.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Hans de Goede 10 years ago
parent
commit
3f78a28037
1 changed files with 1 additions and 11 deletions
  1. 1 11
      common/usb_kbd.c

+ 1 - 11
common/usb_kbd.c

@@ -490,7 +490,7 @@ static int usb_kbd_probe(struct usb_device *dev, unsigned int ifnum)
 /* Search for keyboard and register it if found. */
 /* Search for keyboard and register it if found. */
 int drv_usb_kbd_init(void)
 int drv_usb_kbd_init(void)
 {
 {
-	struct stdio_dev usb_kbd_dev, *old_dev;
+	struct stdio_dev usb_kbd_dev;
 	struct usb_device *dev;
 	struct usb_device *dev;
 	char *stdinname = getenv("stdin");
 	char *stdinname = getenv("stdin");
 	int error, i;
 	int error, i;
@@ -509,16 +509,6 @@ int drv_usb_kbd_init(void)
 		if (usb_kbd_probe(dev, 0) != 1)
 		if (usb_kbd_probe(dev, 0) != 1)
 			continue;
 			continue;
 
 
-		/* We found a keyboard, check if it is already registered. */
-		debug("USB KBD: found set up device.\n");
-		old_dev = stdio_get_by_name(DEVNAME);
-		if (old_dev) {
-			/* Already registered, just return ok. */
-			debug("USB KBD: is already registered.\n");
-			usb_kbd_deregister();
-			return 1;
-		}
-
 		/* Register the keyboard */
 		/* Register the keyboard */
 		debug("USB KBD: register.\n");
 		debug("USB KBD: register.\n");
 		memset(&usb_kbd_dev, 0, sizeof(struct stdio_dev));
 		memset(&usb_kbd_dev, 0, sizeof(struct stdio_dev));