Changeset 27eb1fe in mainline for uspace/drv/usbhid/usbhid.c
- Timestamp:
- 2011-04-15T13:27:58Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- ad86349
- Parents:
- c9dc471 (diff), aaf6155 (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/usbhid/usbhid.c
rc9dc471 r27eb1fe 360 360 rc = usb_hid_check_pipes(hid_dev, dev); 361 361 if (rc != EOK) { 362 usb_hid_free(&hid_dev);362 //usb_hid_free(&hid_dev); 363 363 return rc; 364 364 } … … 368 368 if (rc != EOK) { 369 369 usb_log_error("Failed to initialize report parser.\n"); 370 usb_hid_free(&hid_dev);370 //usb_hid_free(&hid_dev); 371 371 return rc; 372 372 } … … 386 386 " device.\n"); 387 387 fallback = true; 388 assert(hid_dev->subdrivers == NULL); 389 assert(hid_dev->subdriver_count == 0); 388 390 } 389 391 } else { … … 426 428 usb_log_error("No subdriver for handling this device could be" 427 429 " initialized: %s.\n", str_error(rc)); 428 usb_hid_free(&hid_dev); 430 usb_log_debug("Subdriver count: %d\n", 431 hid_dev->subdriver_count); 432 //usb_hid_free(&hid_dev); 429 433 } else { 430 434 bool ok = false; … … 550 554 } 551 555 556 usb_log_debug("Subdrivers: %p, subdriver count: %d\n", 557 (*hid_dev)->subdrivers, (*hid_dev)->subdriver_count); 558 552 559 assert((*hid_dev)->subdrivers != NULL 553 560 || (*hid_dev)->subdriver_count == 0);
Note:
See TracChangeset
for help on using the changeset viewer.