]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
usb: kbd: Do not treat -ENODEV as an error for usb_kbd_deregister
authorHans de Goede <hdegoede@redhat.com>
Sat, 20 Sep 2014 14:54:34 +0000 (16:54 +0200)
committerMarek Vasut <marex@denx.de>
Mon, 6 Oct 2014 12:50:42 +0000 (14:50 +0200)
ENODEV menas no usb keyboard was registered, threat this as a successful
usb_kbd_deregister.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
common/usb_kbd.c

index 87f4125a9f2f19ef92ca88b92ea8160c3961cabe..4c17b0d8ec37052d0349a87d02c9ecf839754756 100644 (file)
@@ -8,6 +8,7 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
+#include <errno.h>
 #include <malloc.h>
 #include <stdio_dev.h>
 #include <asm/byteorder.h>
@@ -559,7 +560,11 @@ int drv_usb_kbd_init(void)
 int usb_kbd_deregister(void)
 {
 #ifdef CONFIG_SYS_STDIO_DEREGISTER
-       return stdio_deregister(DEVNAME);
+       int ret = stdio_deregister(DEVNAME);
+       if (ret && ret != -ENODEV)
+               return ret;
+
+       return 0;
 #else
        return 1;
 #endif