Changeset 1ccc32f in mainline


Ignore:
Timestamp:
2011-10-13T06:57:55Z (12 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
25696fea
Parents:
1a7756a (diff), 21881bd8 (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.
Message:

Merge with mainline

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/console/cmd.c

    r1a7756a r1ccc32f  
    11771177                /* Execute the test */
    11781178                test_quiet = true;
    1179                 const char *ret = test->entry();
     1179                const char *test_ret = test->entry();
    11801180               
    11811181                /* Update and read thread accounting */
     
    11851185                irq_spinlock_unlock(&TASK->lock, true);
    11861186               
    1187                 if (ret != NULL) {
    1188                         printf("%s\n", ret);
     1187                if (test_ret != NULL) {
     1188                        printf("%s\n", test_ret);
    11891189                        ret = false;
    11901190                        break;
  • uspace/drv/bus/usb/usbhub/usbhub.c

    r1a7756a r1ccc32f  
    242242            USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE,
    243243            USB_DESCTYPE_HUB, 0, 0, &descriptor,
    244             sizeof(usb_hub_descriptor_t), &received_size);
     244            sizeof(usb_hub_descriptor_header_t), &received_size);
    245245        if (opResult != EOK) {
    246246                usb_log_error("Failed to receive hub descriptor: %s.\n",
Note: See TracChangeset for help on using the changeset viewer.