Changeset ff381a7 in mainline for uspace/drv/bus/usb/ehci/res.c


Ignore:
Timestamp:
2015-11-02T20:54:19Z (9 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/drv/bus/usb/ehci/res.c

    r3feeab2 rff381a7  
    8181       
    8282        async_sess_t *parent_sess = devman_parent_device_connect(
    83             EXCHANGE_SERIALIZE, ddf_dev_get_handle(dev), IPC_FLAG_BLOCKING);
     83            ddf_dev_get_handle(dev), IPC_FLAG_BLOCKING);
    8484        if (!parent_sess)
    8585                return ENOMEM;
    … …  
    115115{
    116116        async_sess_t *parent_sess = devman_parent_device_connect(
    117             EXCHANGE_SERIALIZE, ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
     117            ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
    118118        if (!parent_sess)
    119119                return ENOMEM;
    … …  
    138138
    139139        async_sess_t *parent_sess = devman_parent_device_connect(
    140             EXCHANGE_SERIALIZE, ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
     140            ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
    141141        if (!parent_sess)
    142142                return ENOMEM;
Note: See TracChangeset for help on using the changeset viewer.