Ignore:
Timestamp:
2015-11-02T20:54:19Z (8 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d8513177
Parents:
3feeab2 (diff), 5265eea4 (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 mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/usbhost/src/usb_endpoint_manager.c

    r3feeab2 rff381a7  
    253253        if (endpoint != NULL) {
    254254                fibril_mutex_unlock(&instance->guard);
    255                 return EEXISTS;
     255                return EEXIST;
    256256        }
    257257        list_append(&ep->link, get_list(instance, ep->address));
     
    339339        if (ep != NULL) {
    340340                fibril_mutex_unlock(&instance->guard);
    341                 return EEXISTS;
     341                return EEXIST;
    342342        }
    343343
Note: See TracChangeset for help on using the changeset viewer.