]> git.sur5r.net Git - u-boot/commitdiff
dm: usb: Do not reprobe usb hosts on "usb tree" command
authorHans de Goede <hdegoede@redhat.com>
Sat, 2 Apr 2016 22:04:39 +0000 (00:04 +0200)
committerMarek Vasut <marex@denx.de>
Sun, 10 Apr 2016 15:18:43 +0000 (17:18 +0200)
Some usb hosts may have failed to probe on "usb start", i.e. an otg
host without an otg-host cable plugged in.

"usb tree" would cause the probe method of these hosts to get called
again, something which should only happen on "usb reset".

This commit fixes this.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
cmd/usb.c

index 97dd6f0099dc24b24d66f8cd9dd348d7a79b65d3..f1a7debdf3d918f0ca5c23dc94efbc0e956b647d 100644 (file)
--- a/cmd/usb.c
+++ b/cmd/usb.c
@@ -15,6 +15,7 @@
 #include <command.h>
 #include <console.h>
 #include <dm.h>
+#include <dm/uclass-internal.h>
 #include <memalign.h>
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
@@ -442,12 +443,15 @@ void usb_show_tree(void)
 #ifdef CONFIG_DM_USB
        struct udevice *bus;
 
-       for (uclass_first_device(UCLASS_USB, &bus);
+       for (uclass_find_first_device(UCLASS_USB, &bus);
                bus;
-               uclass_next_device(&bus)) {
+               uclass_find_next_device(&bus)) {
                struct usb_device *udev;
                struct udevice *dev;
 
+               if (!device_active(bus))
+                       continue;
+
                device_find_first_child(bus, &dev);
                if (dev && device_active(dev)) {
                        udev = dev_get_parent_priv(dev);