1
0
mirror of https://xff.cz/git/u-boot/ synced 2025-08-31 16:22:36 +02:00

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 <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede
2016-04-03 09:18:53 +02:00
committed by Marek Vasut
parent cfb3f1cd0e
commit 9a80e71435
2 changed files with 3 additions and 2 deletions

View File

@@ -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)