From 0ea09dfe873657df47d83d5d4e0090bbf05c6abb Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sat, 20 Sep 2014 16:54:34 +0200
Subject: [PATCH] usb: kbd: Do not treat -ENODEV as an error for
usb_kbd_deregister
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 | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 87f4125a9f..4c17b0d8ec 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -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
--
2.39.5