Changeset 5dd9209 in mainline for uspace/drv/usbhub/usbhub.c
- Timestamp:
- 2011-03-04T17:19:14Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 3faf416c
- Parents:
- 21bb58d (diff), 969a6ff (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/usbhub/usbhub.c
r21bb58d r5dd9209 243 243 dprintf(USB_LOG_LEVEL_ERROR, "failed when receiving hub descriptor, badcode = %d",opResult); 244 244 free(serialized_descriptor); 245 return result; 245 free(result); 246 return NULL; 246 247 } 247 248 dprintf(USB_LOG_LEVEL_DEBUG2, "deserializing descriptor"); … … 249 250 if(descriptor==NULL){ 250 251 dprintf(USB_LOG_LEVEL_WARNING, "could not deserialize descriptor "); 251 result->port_count = 1;///\TODO this code is only for debug!!!252 return result;252 free(result); 253 return NULL; 253 254 } 254 255 … … 286 287 287 288 usb_hub_info_t * hub_info = usb_create_hub_info(dev); 289 if(!hub_info){ 290 return EINTR; 291 } 288 292 289 293 int opResult; … … 294 298 opResult = usb_hub_process_configuration_descriptors(hub_info); 295 299 if(opResult != EOK){ 296 dprintf(USB_LOG_LEVEL_ERROR,"could not get con diguration descriptors, %d",300 dprintf(USB_LOG_LEVEL_ERROR,"could not get configuration descriptors, %d", 297 301 opResult); 298 302 return opResult;
Note:
See TracChangeset
for help on using the changeset viewer.