diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2015-06-17 21:33:53 +0200 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-07-21 17:39:36 -0600 |
| commit | fd1bd21bf07d0770bff7b477d501b706dac9987d (patch) | |
| tree | 445fde217c90b8eb340f8a4599bf2947e544920e /drivers | |
| parent | b2f219b081de964583a5621bc59d43eb75521598 (diff) | |
| download | u-boot-imx-fd1bd21bf07d0770bff7b477d501b706dac9987d.zip u-boot-imx-fd1bd21bf07d0770bff7b477d501b706dac9987d.tar.gz u-boot-imx-fd1bd21bf07d0770bff7b477d501b706dac9987d.tar.bz2 | |
dm: usb: Do not assume that first child is always a hub
On some single port (otg) controllers there is no emulated root hub, so
the first child (if any) may be one of: UCLASS_MASS_STORAGE,
UCLASS_USB_DEV_GENERIC or UCLASS_USB_HUB.
All three of these (and in the future others) are suitable for our
purposes, remove the check for the device being a hub, and add a check to
deal with the fact that there may be no child-dev.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/host/usb-uclass.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index b0e6e71..c5d1e7f 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -303,14 +303,14 @@ static struct usb_device *find_child_devnum(struct udevice *parent, int devnum) struct usb_device *usb_get_dev_index(struct udevice *bus, int index) { - struct udevice *hub; + struct udevice *dev; int devnum = index + 1; /* Addresses are allocated from 1 on USB */ - device_find_first_child(bus, &hub); - if (device_get_uclass_id(hub) == UCLASS_USB_HUB) - return find_child_devnum(hub, devnum); + device_find_first_child(bus, &dev); + if (!dev) + return NULL; - return NULL; + return find_child_devnum(dev, devnum); } int usb_post_bind(struct udevice *dev) |