From: Hans de Goede <hdegoede@redhat.com>
Date: Sat, 20 Sep 2014 14:54:36 +0000 (+0200)
Subject: usb: kbd: Remove check for already being registered
X-Git-Tag: v2014.10-rc3~1^2~13
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3f78a28037c65b92d2717b7787902a853c2506a4;p=oweals%2Fu-boot.git

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>
---

diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 4c17b0d8ec..d4d5f48521 100644
--- a/common/usb_kbd.c
+++ b/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. */
 int drv_usb_kbd_init(void)
 {
-	struct stdio_dev usb_kbd_dev, *old_dev;
+	struct stdio_dev usb_kbd_dev;
 	struct usb_device *dev;
 	char *stdinname = getenv("stdin");
 	int error, i;
@@ -509,16 +509,6 @@ int drv_usb_kbd_init(void)
 		if (usb_kbd_probe(dev, 0) != 1)
 			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 */
 		debug("USB KBD: register.\n");
 		memset(&usb_kbd_dev, 0, sizeof(struct stdio_dev));