leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
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,
struct usb_device_descriptor *desc,
struct usb_interface_descriptor *iface,
struct udevice **devp)
static int usb_find_child(struct udevice *parent,
struct usb_device_descriptor *desc,
struct usb_interface_descriptor *iface,
struct udevice **devp)
{
#ifdef CONFIG_SANDBOX
struct udevice *dev;
*devp = NULL;
@ -520,7 +521,7 @@ static int usb_find_emul_child(struct udevice *parent,
return 0;
}
}
#endif
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);
if (ret)
return ret;
ret = usb_find_emul_child(parent, &udev->descriptor, iface, &dev);
debug("** usb_find_emul_child returns %d\n", ret);
ret = usb_find_child(parent, &udev->descriptor, iface, &dev);
debug("** usb_find_child returns %d\n", ret);
if (ret) {
if (ret != -ENOENT)
return ret;