Changeset 5ec492b in mainline for uspace/drv/bus/usb/ohci/hc.c
- Timestamp:
- 2011-09-07T14:09:07Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- ffe3fe1
- Parents:
- d394f1b8
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/ohci/hc.c
rd394f1b8 r5ec492b 139 139 &instance->generic.dev_manager, hub_address, hub_fun->handle); 140 140 141 #define CHECK_RET_ RETURN(ret, message...) \141 #define CHECK_RET_UNREG_RETURN(ret, message...) \ 142 142 if (ret != EOK) { \ 143 143 usb_log_error(message); \ 144 usb_endpoint_manager_unregister_ep( \ 145 &instance->generic.ep_manager, hub_address, 0, USB_DIRECTION_BOTH);\ 146 usb_device_keeper_release( \ 147 &instance->generic.dev_manager, hub_address); \ 144 148 return ret; \ 145 149 } else (void)0 … … 147 151 &instance->generic.ep_manager, hub_address, 0, USB_DIRECTION_BOTH, 148 152 USB_TRANSFER_CONTROL, USB_SPEED_FULL, 64, 0); 149 CHECK_RET_ RETURN(ret,153 CHECK_RET_UNREG_RETURN(ret, 150 154 "Failed to register root hub control endpoint: %s.\n", 151 155 str_error(ret)); 152 156 153 157 ret = ddf_fun_add_match_id(hub_fun, "usb&class=hub", 100); 154 CHECK_RET_ RETURN(ret,158 CHECK_RET_UNREG_RETURN(ret, 155 159 "Failed to add root hub match-id: %s.\n", str_error(ret)); 156 160 157 161 ret = ddf_fun_bind(hub_fun); 158 CHECK_RET_ RETURN(ret,162 CHECK_RET_UNREG_RETURN(ret, 159 163 "Failed to bind root hub function: %s.\n", str_error(ret)); 160 164
Note:
See TracChangeset
for help on using the changeset viewer.