summaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2016-07-03 20:22:05 +0200
committerMarek Vasut <marex@denx.de>2016-07-05 14:14:11 +0200
commite6e188f5623e3db7fcba785f4246d16425dd2104 (patch)
tree88f6e27f6879e9f487984fa02efad750bb274cf3 /cmd
parent2138fd6d5d358bcfef6631300763c16a70f2af3d (diff)
downloadblackbird-obmc-uboot-e6e188f5623e3db7fcba785f4246d16425dd2104.tar.gz
blackbird-obmc-uboot-e6e188f5623e3db7fcba785f4246d16425dd2104.zip
usb: dm: Make "usb info" use usb_for_each_root_dev()
The old dm "usb info" implementation has several issues: 1) NULL pointer deref when a bus has no children 2) Not showing usb devices on busses without an emulated root-hub (otg host) 3) Attempting to show devices on inactive busses 4) "usb info" Would cause some hosts to get re-probed something which only "usb reset" should do TL;DR: proper iterating over usb bus root devs is hard, use the helper for it. Reported-by: Bernhard Nortmann <bernhard.nortmann@web.de> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/usb.c31
1 files changed, 6 insertions, 25 deletions
diff --git a/cmd/usb.c b/cmd/usb.c
index 5453c0d4c5..455127c844 100644
--- a/cmd/usb.c
+++ b/cmd/usb.c
@@ -593,39 +593,20 @@ static void do_usb_start(void)
}
#ifdef CONFIG_DM_USB
-static void show_info(struct udevice *dev)
+static void usb_show_info(struct usb_device *udev)
{
struct udevice *child;
- struct usb_device *udev;
- udev = dev_get_parent_priv(dev);
usb_display_desc(udev);
usb_display_config(udev);
- for (device_find_first_child(dev, &child);
+ for (device_find_first_child(udev->dev, &child);
child;
device_find_next_child(&child)) {
- if (device_active(child))
- show_info(child);
- }
-}
-
-static int usb_device_info(void)
-{
- struct udevice *bus;
-
- for (uclass_first_device(UCLASS_USB, &bus);
- bus;
- uclass_next_device(&bus)) {
- struct udevice *hub;
-
- device_find_first_child(bus, &hub);
- if (device_get_uclass_id(hub) == UCLASS_USB_HUB &&
- device_active(hub)) {
- show_info(hub);
+ if (device_active(child)) {
+ udev = dev_get_parent_priv(child);
+ usb_show_info(udev);
}
}
-
- return 0;
}
#endif
@@ -681,7 +662,7 @@ static int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (strncmp(argv[1], "inf", 3) == 0) {
if (argc == 2) {
#ifdef CONFIG_DM_USB
- usb_device_info();
+ usb_for_each_root_dev(usb_show_info);
#else
int d;
for (d = 0; d < USB_MAX_DEVICE; d++) {
OpenPOWER on IntegriCloud