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


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/drv/bus/usb/uhci/res.c

    r3feeab2 rff381a7  
    5555
    5656        async_sess_t *parent_sess =
    57             devman_parent_device_connect(EXCHANGE_SERIALIZE,
    58             ddf_dev_get_handle(dev), IPC_FLAG_BLOCKING);
     57            devman_parent_device_connect(ddf_dev_get_handle(dev),
     58            IPC_FLAG_BLOCKING);
    5959        if (!parent_sess)
    6060                return ENOMEM;
     
    9191{
    9292        async_sess_t *parent_sess =
    93             devman_parent_device_connect(EXCHANGE_SERIALIZE,
    94             ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
     93            devman_parent_device_connect(ddf_dev_get_handle(device),
     94            IPC_FLAG_BLOCKING);
    9595        if (!parent_sess)
    9696                return ENOMEM;
     
    112112
    113113        async_sess_t *parent_sess = devman_parent_device_connect(
    114             EXCHANGE_SERIALIZE, ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
     114            ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
    115115        if (!parent_sess)
    116116                return ENOMEM;
Note: See TracChangeset for help on using the changeset viewer.