Changeset 2afc54d in mainline for uspace/srv/devman/main.c

Timestamp:

2011-03-28T22:09:56Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

93ebe4e

Parents:

fd89cf9 (diff), 0418050 (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 devman fixes by Vojtech Horky.

File:

• uspace/srv/devman/main.c (modified) (1 diff)

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);