Changeset e3f7418 in mainline for uspace/drv/bus/usb/usbhub/usbhub.c
- Timestamp:
- 2011-10-15T13:06:28Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a044f71
- Parents:
- 3958e315 (diff), 065064e6 (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/bus/usb/usbhub/usbhub.c
r3958e315 re3f7418 117 117 ddf_fun_destroy(hub->hub_fun); 118 118 119 free(hub);120 usb_dev->driver_data = NULL;121 119 usb_log_info("USB hub driver, stopped and cleaned.\n"); 122 120 return EOK; … … 254 252 { 255 253 assert(usb_dev); 256 usb_hub_dev_t *hub_dev = malloc(sizeof(usb_hub_dev_t)); 254 usb_hub_dev_t *hub_dev = 255 usb_device_data_alloc(usb_dev, sizeof(usb_hub_dev_t)); 257 256 if (!hub_dev) 258 257 return NULL; 259 258 260 259 hub_dev->usb_device = usb_dev; 261 262 260 hub_dev->ports = NULL; 263 261 hub_dev->port_count = 0; … … 266 264 fibril_mutex_initialize(&hub_dev->pending_ops_mutex); 267 265 fibril_condvar_initialize(&hub_dev->pending_ops_cv); 268 usb_dev->driver_data = hub_dev;269 266 270 267 return hub_dev;
Note:
See TracChangeset
for help on using the changeset viewer.