diff options
| author | Tom Rini <trini@konsulko.com> | 2023-06-21 14:42:50 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-06-21 14:42:50 -0400 |
| commit | 68c07fc5fdf34f0926cf06fc0c4ebd6f2f3afe19 (patch) | |
| tree | cf8e2042b7ff8b7d9f3b80dc901a1dbed8f03642 /cmd/usb.c | |
| parent | 50842b217fef505a0ec6662cc2acdc55d0bb23c5 (diff) | |
| parent | 9c9454ac2e4ffd9a8b30744329029f1676d2e7be (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-usb
Diffstat (limited to 'cmd/usb.c')
| -rw-r--r-- | cmd/usb.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cmd/usb.c b/cmd/usb.c index 61937283840..23253f22231 100644 --- a/cmd/usb.c +++ b/cmd/usb.c @@ -421,7 +421,9 @@ static void usb_show_tree_graph(struct usb_device *dev, char *pre) * Ignore emulators and block child devices, we only want * real devices */ - if ((device_get_uclass_id(child) != UCLASS_USB_EMUL) && + if (udev && + (device_get_uclass_id(child) != UCLASS_BOOTDEV) && + (device_get_uclass_id(child) != UCLASS_USB_EMUL) && (device_get_uclass_id(child) != UCLASS_BLK)) { usb_show_tree_graph(udev, pre); pre[index] = 0; @@ -604,10 +606,12 @@ static void usb_show_info(struct usb_device *udev) child; device_find_next_child(&child)) { if (device_active(child) && + (device_get_uclass_id(child) != UCLASS_BOOTDEV) && (device_get_uclass_id(child) != UCLASS_USB_EMUL) && (device_get_uclass_id(child) != UCLASS_BLK)) { udev = dev_get_parent_priv(child); - usb_show_info(udev); + if (udev) + usb_show_info(udev); } } } |