Commit 6cda3695 authored by Hans de Goede's avatar Hans de Goede Committed by Simon Glass
Browse files

dm: usb: Use device_unbind_children to clean up usb devs on stop

On an usb stop instead of leaving orphan usb devices behind simply remove

The result of this commit is best seen in the output of "dm tree" after
plugging out an usb hub with 2 devices plugges in and plugging in a keyb.
instead, before this commit the output would be:

 usb         [ + ]    `-- sunxi-musb
 usb_hub     [   ]        |-- usb_hub
 usb_mass_st [   ]        |   |-- usb_mass_storage
 usb_dev_gen [   ]        |   `-- generic_bus_0_dev_3
 usb_dev_gen [ + ]        `-- generic_bus_0_dev_1

Notice the non active usb_hub child and its 2 non active children. The
first child being non-active as in this example also causes usb_get_dev_index
to return NULL when probing the first child, which results in the usb kbd
code not binding to the keyboard.

With this commit in place the output after swapping and "usb reset" is:

 usb         [ + ]    `-- sunxi-musb
 usb_dev_gen [ + ]        `-- generic_bus_0_dev_1

As expected, and usb_get_dev_index works properly and the keyboard works.
Signed-off-by: default avatarHans de Goede <>
Acked-by: Simon Glass's avatarSimon Glass <>
parent e5c4564e
......@@ -146,6 +146,9 @@ int usb_stop(void)
ret = device_remove(bus);
if (ret && !err)
err = ret;
ret = device_unbind_children(bus);
if (ret && !err)
err = ret;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment