Changeset 9efad54 in mainline for uspace/lib/usbdev/src/devdrv.c
- Timestamp:
- 2018-01-06T21:15:48Z (6 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 56257ba
- Parents:
- c901632
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usbdev/src/devdrv.c
rc901632 r9efad54 255 255 256 256 /* Register created pipes. */ 257 unsigned pipes_registered = 0; 257 258 for (size_t i = 0; i < pipe_count; i++) { 258 259 if (pipes[i].present) { 259 rc = usb_pipe_register(&pipes[i].pipe );260 rc = usb_pipe_register(&pipes[i].pipe, pipes[i].descriptor, pipes[i].companion_descriptor); 260 261 if (rc != EOK) { 261 262 goto rollback_unregister_endpoints; 262 263 } 263 264 } 265 pipes_registered++; 264 266 } 265 267 … … 276 278 */ 277 279 rollback_unregister_endpoints: 278 for (size_t i = 0; i < pipe _count; i++) {280 for (size_t i = 0; i < pipes_registered; i++) { 279 281 if (pipes[i].present) { 280 282 usb_pipe_unregister(&pipes[i].pipe); … … 419 421 /* This pipe was registered by the hub driver, 420 422 * during device initialization. */ 421 int rc = usb_pipe_initialize_default_control( 422 &usb_dev->ctrl_pipe, usb_dev->bus_session); 423 int rc = usb_pipe_initialize_default_control(&usb_dev->ctrl_pipe, usb_dev->bus_session); 423 424 if (rc != EOK) { 424 425 usb_dev_disconnect(usb_dev->bus_session);
Note:
See TracChangeset
for help on using the changeset viewer.