Kconfig: j721s2: Change K3_MCU_SCRATCHPAD_BASE to non firewalled region

[J-u-boot.git] / common / usb_kbd.c

diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 352d86fb2ecede259107bb75a57fb09645dba6d1..4cbc9acb73800091a9d3ecc654d4e0d10526a3d1 100644 (file)
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -446,7 +446,7 @@ static int usb_kbd_getc(struct stdio_dev *sdev)
        data = usb_kbd_dev->privptr;
 
        while (data->usb_in_pointer == data->usb_out_pointer) {
-               WATCHDOG_RESET();
+               schedule();
                usb_kbd_poll_for_event(usb_kbd_dev);
        }
 
@@ -581,21 +581,22 @@ static int probe_usb_keyboard(struct usb_device *dev)
 
        stdinname = env_get("stdin");
 #if CONFIG_IS_ENABLED(CONSOLE_MUX)
-       error = iomux_doenv(stdin, stdinname);
-       if (error)
-               return error;
+       if (strstr(stdinname, DEVNAME) != NULL) {
+               error = iomux_doenv(stdin, stdinname);
+               if (error)
+                       return error;
+       }
 #else
        /* Check if this is the standard input device. */
-       if (strcmp(stdinname, DEVNAME))
-               return 1;
-
-       /* Reassign the console */
-       if (overwrite_console())
-               return 1;
+       if (!strcmp(stdinname, DEVNAME)) {
+               /* Reassign the console */
+               if (overwrite_console())
+                       return 1;
 
-       error = console_assign(stdin, DEVNAME);
-       if (error)
-               return error;
+               error = console_assign(stdin, DEVNAME);
+               if (error)
+                       return error;
+       }
 #endif
 
        return 0;