Changeset 97c7682 in mainline for uspace/lib/c/generic/devman.c
- Timestamp:
- 2012-07-14T11:18:40Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 804d9b6
- Parents:
- 0747468 (diff), f0348c8 (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/lib/c/generic/devman.c
r0747468 r97c7682 188 188 189 189 if (retval != EOK) { 190 async_ wait_for(req, NULL);190 async_forget(req); 191 191 return retval; 192 192 } … … 226 226 if (retval != EOK) { 227 227 devman_exchange_end(exch); 228 async_ wait_for(req, NULL);228 async_forget(req); 229 229 return retval; 230 230 } … … 242 242 if (retval != EOK) { 243 243 devman_exchange_end(exch); 244 async_ wait_for(req2, NULL);245 async_ wait_for(req, NULL);244 async_forget(req2); 245 async_forget(req); 246 246 return retval; 247 247 } … … 250 250 if (retval != EOK) { 251 251 devman_exchange_end(exch); 252 async_ wait_for(req, NULL);252 async_forget(req); 253 253 return retval; 254 254 } … … 283 283 284 284 if (retval != EOK) { 285 async_ wait_for(req, NULL);285 async_forget(req); 286 286 return retval; 287 287 } … … 386 386 387 387 if (retval != EOK) { 388 async_ wait_for(req, NULL);388 async_forget(req); 389 389 return retval; 390 390 } … … 423 423 424 424 if (dretval != EOK) { 425 async_ wait_for(req, NULL);425 async_forget(req); 426 426 return dretval; 427 427 } … … 430 430 async_wait_for(req, &retval); 431 431 432 if (retval != EOK) 433 return retval; 432 if (retval != EOK) { 433 return retval; 434 } 434 435 435 436 act_size = IPC_GET_ARG2(dreply); … … 452 453 } 453 454 455 int devman_fun_get_driver_name(devman_handle_t handle, char *buf, size_t buf_size) 456 { 457 return devman_get_str_internal(DEVMAN_FUN_GET_DRIVER_NAME, handle, buf, 458 buf_size); 459 } 460 454 461 int devman_fun_online(devman_handle_t funh) 455 462 { … … 488 495 489 496 if (rc != EOK) { 490 async_ wait_for(req, NULL);497 async_forget(req); 491 498 return rc; 492 499 }
Note:
See TracChangeset
for help on using the changeset viewer.