Changeset d011038 in mainline for uspace/srv/devman/main.c

Timestamp:

2011-03-29T20:12:44Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8f17503

Parents:

c4fb95d3 (diff), 93ebe4e (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:

• uspace/srv/devman/main.c (modified) (2 diffs)

uspace/srv/devman/main.c

@@ -477 +477 @@
                 dev = fun->dev;
 
-        if (fun == NULL && dev == NULL) {
+        /*
+         * For a valid function to connect to we need a device. The root
+         * function, for example, has no device and cannot be connected to.
+         * This means @c dev needs to be valid regardless whether we are
+         * connecting to a device or to a function.
+         */
+        if (dev == NULL) {
                 printf(NAME ": devman_forward error - no device or function with "
                     "handle %" PRIun " was found.\n", handle);
@@ -562 +568 @@
         }
         
-        async_forward_fast(iid, dev->drv->phone, DRIVER_CLIENT, dev->handle, 0,
+        async_forward_fast(iid, dev->drv->phone, DRIVER_CLIENT, fun->handle, 0,
             IPC_FF_NONE);
         printf(NAME ": devman_connection_devmapper: forwarded connection to "