Changeset a825eeb0 in mainline for uspace/drv/bus/usb/usbhub/usbhub.c

Timestamp:

2011-10-13T12:55:34Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

22a2b763

Parents:

3875af65

Message:

usbhub: Remove connected devices before confirming device gone.

File:

• uspace/drv/bus/usb/usbhub/usbhub.c (modified) (2 diffs)

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -98 +98 @@
 
         assert(!hub->running);
+
+        for (size_t port = 0; port < hub->port_count; ++port) {
+                if (hub->ports[port].attached_device.fun) {
+                        const int ret =
+                            usb_hub_port_fini(&hub->ports[port], hub);
+                        if (ret != EOK)
+                                return ret;
+                }
+        }
+        free(hub->ports);
+
         const int ret = ddf_fun_unbind(hub->hub_fun);
         if (ret != EOK) {
@@ -105 +116 @@
         }
         ddf_fun_destroy(hub->hub_fun);
-        free(hub->ports);
+
         free(hub);
         usb_dev->driver_data = NULL;