From fb3ef649ed5cf3e5e73aea6ed161cdde37cb7a5f Mon Sep 17 00:00:00 2001 From: "amartin@nvidia.com" Date: Fri, 23 Dec 2011 10:29:48 +0000 Subject: USB: reevaluate iomux stdin on USB kbd detect If CONSOLE_MUX is enabled, reevaluate console stdin when USB keyboard device is detected. Signed-off-by: Allen Martin --- common/usb_kbd.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'common') diff --git a/common/usb_kbd.c b/common/usb_kbd.c index 2472d25d4a..960a70a43d 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -487,6 +487,11 @@ int drv_usb_kbd_init(void) if (error) return error; +#ifdef CONFIG_CONSOLE_MUX + error = iomux_doenv(stdin, stdinname); + if (error) + return error; +#else /* Check if this is the standard input device. */ if (strcmp(stdinname, DEVNAME)) return 1; @@ -498,6 +503,7 @@ int drv_usb_kbd_init(void) error = console_assign(stdin, DEVNAME); if (error) return error; +#endif return 1; } -- cgit v1.2.3