summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/usb_kbd.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 670d953a166..182bb883cc8 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -478,15 +478,19 @@ int drv_usb_kbd_init(void)
if (error)
return error;
- /* Check if this is the standard input device. */
- if (strcmp(stdinname, DEVNAME))
- return 1;
-
/* Reassign the console */
if (overwrite_console())
return 1;
+ /* Check if this is the standard input device. */
+#ifdef CONFIG_CONSOLE_MUX
+ error = iomux_doenv(stdin, stdinname);
+#else
+ if (strcmp(stdinname, DEVNAME))
+ return 1;
+
error = console_assign(stdin, DEVNAME);
+#endif
if (error)
return error;