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

Timestamp:

2017-10-17T13:11:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• uspace/drv/bus/usb/ehci/res.c (modified) (2 diffs)

uspace/drv/bus/usb/ehci/res.c

@@ -39 +39 @@
 #include <str_error.h>
 #include <assert.h>
-#include <devman.h>
+#include <ddf/driver.h>
 #include <ddi.h>
 #include <usb/debug.h>
@@ -176 +176 @@
         assert(device);
 
-        async_sess_t *parent_sess = devman_parent_device_connect(
-            ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
-        if (!parent_sess)
+        async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
+        if (parent_sess == NULL)
                 return ENOMEM;