dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-29 22:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "dm: usb: Rename usb_find_child to usb_find_emul_child"

Browse Source 
This reverts commit 9b510df703.

We want to avoid having the USB stack rely on unbind.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2015-11-08 23:47:56 -07:00
parent af9c7c11e9
commit 1b6a1dff71
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/usb/host/usb-uclass.c
View File

@@ -494,14 +494,15 @@ error:
} }
/** /**
* usb_find_emul_child() - Find an existing device for emulated devices * usb_find_child() - Find an existing device which matches our needs
*
*
*/ */
static int usb_find_emul_child(struct udevice *parent, static int usb_find_child(struct udevice *parent,
struct usb_device_descriptor *desc, struct usb_device_descriptor *desc,
struct usb_interface_descriptor *iface, struct usb_interface_descriptor *iface,
struct udevice **devp) struct udevice **devp)
{ {
#ifdef CONFIG_SANDBOX
struct udevice *dev; struct udevice *dev;
*devp = NULL; *devp = NULL;
@@ -520,7 +521,7 @@ static int usb_find_emul_child(struct udevice *parent,
return 0; return 0;
} }
} }
#endif
return -ENOENT; return -ENOENT;
} }
@@ -580,8 +581,8 @@ int usb_scan_device(struct udevice *parent, int port,
debug("read_descriptor for '%s': ret=%d\n", parent->name, ret); debug("read_descriptor for '%s': ret=%d\n", parent->name, ret);
if (ret) if (ret)
return ret; return ret;
ret = usb_find_emul_child(parent, &udev->descriptor, iface, &dev); ret = usb_find_child(parent, &udev->descriptor, iface, &dev);
debug("** usb_find_emul_child returns %d\n", ret); debug("** usb_find_child returns %d\n", ret);
if (ret) { if (ret) {
if (ret != -ENOENT) if (ret != -ENOENT)
return ret; return ret;