Changeset 4967c1e in mainline

Timestamp:

2011-05-27T17:43:12Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

ee7e7c93

Parents:

574f276 (diff), 6bbbcabe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Development changes

Location:

uspace

Files:

• drv/usbhub/usbhub.c (modified) (1 diff)
• lib/usbdev/src/hub.c (modified) (1 diff)

uspace/drv/usbhub/usbhub.c

@@ -336 +336 @@
  */
 static int usb_hub_start_hub_fibril(usb_hub_info_t * hub_info){
-        /*
-         * The processing will require opened control pipe and connection
-         * to the host controller.
-         * It is waste of resources but let's hope there will be less
-         * hubs than the phone limit.
-         * FIXME: with some proper locking over pipes and session
-         * auto destruction, this could work better.
-         */
-        int rc = usb_hc_connection_open(&hub_info->connection);
-        if (rc != EOK) {
-                //usb_pipe_end_session(hub_info->control_pipe);
-                usb_log_error("Failed to open connection to HC: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
+        int rc;
 
         rc = usb_device_auto_poll(hub_info->usb_device, 0,

uspace/lib/usbdev/src/hub.c

@@ -331 +331 @@
                 goto leave_release_free_address;
         }
+        
+        usb_hc_connection_close(&hc_conn);
 
         /*