Changeset 04c722f9 in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-03-04T13:31:34Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

969a6ff

Parents:

f06c9ec (diff), 332f860 (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:

merge from /usb/smekideki; minor changes in hub driver

File:

• uspace/drv/usbhub/usbhub.c (modified) (5 diffs)

uspace/drv/usbhub/usbhub.c

@@ -234 +234 @@
         usb_endpoint_pipe_start_session(&result->endpoints.control);
         opResult = usb_request_get_descriptor(&result->endpoints.control,
-                        USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE,
+                        USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE,
                         USB_DESCTYPE_HUB,
                         0, 0, serialized_descriptor,
@@ -243 +243 @@
                 dprintf(USB_LOG_LEVEL_ERROR, "failed when receiving hub descriptor, badcode = %d",opResult);
                 free(serialized_descriptor);
-                return result;
+                free(result);
+                return NULL;
         }
         dprintf(USB_LOG_LEVEL_DEBUG2, "deserializing descriptor");
@@ -249 +250 @@
         if(descriptor==NULL){
                 dprintf(USB_LOG_LEVEL_WARNING, "could not deserialize descriptor ");
-                result->port_count = 1;///\TODO this code is only for debug!!!
-                return result;
+                free(result);
+                return NULL;
         }
 
@@ -286 +287 @@
 
         usb_hub_info_t * hub_info = usb_create_hub_info(dev);
+        if(!hub_info){
+                return EINTR;
+        }
 
         int opResult;
@@ -294 +298 @@
         opResult = usb_hub_process_configuration_descriptors(hub_info);
         if(opResult != EOK){
-                dprintf(USB_LOG_LEVEL_ERROR,"could not get condiguration descriptors, %d",
+                dprintf(USB_LOG_LEVEL_ERROR,"could not get configuration descriptors, %d",
                                 opResult);
                 return opResult;