From 9a80e714350a959caadfd6e2405cd1f7e8ea86d3 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 3 Apr 2016 09:18:53 +0200 Subject: usb: kbd: Do not deregister usbkbd twice when using dm The dm usb_kbd_remove function() will deregister the usb keyboard for us on a "usb reset" / "usb stop" so there is no need to manually call usb_kbd_deregister() in the dm case. This commit removes usb_kbd_deregister() in the dm case fixing the following "usb reset" errors: usb_kbd_remove: warning, ret=-6 device_remove: Device 'usb_kbd' failed to remove, but children are gone Signed-off-by: Hans de Goede --- common/usb_kbd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'common') diff --git a/common/usb_kbd.c b/common/usb_kbd.c index d84865fbbe2..97f79f8eb8c 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -566,7 +566,6 @@ int drv_usb_kbd_init(void) /* No USB Keyboard found */ return -1; } -#endif /* Deregister the keyboard. */ int usb_kbd_deregister(int force) @@ -599,6 +598,8 @@ int usb_kbd_deregister(int force) #endif } +#endif + #ifdef CONFIG_DM_USB static int usb_kbd_probe(struct udevice *dev) -- cgit v1.2.3