dm: usb: Use device_unbind_children to clean up usb devs on stop
authorHans de Goede <hdegoede@redhat.com>
Wed, 1 Jul 2015 18:53:00 +0000 (20:53 +0200)
committerSimon Glass <sjg@chromium.org>
Tue, 21 Jul 2015 23:39:36 +0000 (17:39 -0600)
On an usb stop instead of leaving orphan usb devices behind simply remove
them.

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: Hans de Goede <hdegoede@redhat.com>
Acked-by: Simon Glass <sjg@chromium.org>
drivers/usb/host/usb-uclass.c

index bce6cec1b5c9c28562b87ca769bac4291d1e3e68..2df67404ca457a9fdd1fd8d4d72d61d7ff51eefd 100644 (file)
@@ -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;
        }
 
 #ifdef CONFIG_SANDBOX