Changeset ff381a7 in mainline for uspace/drv/bus/usb/ohci/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/ohci/res.c

    r3feeab2 rff381a7  
    5757
    5858        async_sess_t *parent_sess =
    59             devman_parent_device_connect(EXCHANGE_SERIALIZE,
    60             ddf_dev_get_handle(dev), IPC_FLAG_BLOCKING);
     59            devman_parent_device_connect(ddf_dev_get_handle(dev),
     60            IPC_FLAG_BLOCKING);
    6161        if (!parent_sess)
    6262                return ENOMEM;
     
    9393{
    9494        async_sess_t *parent_sess =
    95             devman_parent_device_connect(EXCHANGE_SERIALIZE,
    96             ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
     95            devman_parent_device_connect(ddf_dev_get_handle(device),
     96            IPC_FLAG_BLOCKING);
    9797        if (!parent_sess)
    9898                return ENOMEM;
Note: See TracChangeset for help on using the changeset viewer.