diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2014-09-20 16:54:38 +0200 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2014-10-06 14:50:43 +0200 |
| commit | 8a8a2257ec55a997d97edf6664249a628248fe01 (patch) | |
| tree | 703e51bac2512fe3bf2d171acf51444010fac5f3 /common/usb_kbd.c | |
| parent | 32d019265d1f0c334f2f86407abf295d46bd2f4d (diff) | |
| download | talos-obmc-uboot-8a8a2257ec55a997d97edf6664249a628248fe01.tar.gz talos-obmc-uboot-8a8a2257ec55a997d97edf6664249a628248fe01.zip | |
usb: kbd: Allow "usb reset" to continue when an usb kbd is used
Use the new force parameter to make the stdio_deregister succeed, replacing
stdin with a nulldev, and assume that the usb keyboard will come back after
the reset.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'common/usb_kbd.c')
| -rw-r--r-- | common/usb_kbd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/usb_kbd.c b/common/usb_kbd.c index dcb693d0c3..fdc083c70c 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -547,10 +547,10 @@ int drv_usb_kbd_init(void) } /* Deregister the keyboard. */ -int usb_kbd_deregister(void) +int usb_kbd_deregister(int force) { #ifdef CONFIG_SYS_STDIO_DEREGISTER - int ret = stdio_deregister(DEVNAME, 0); + int ret = stdio_deregister(DEVNAME, force); if (ret && ret != -ENODEV) return ret; |
