Changeset 86ffa27f in mainline for uspace/lib/drv/generic/driver.c

Timestamp:

2011-08-07T11:21:44Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cc574511

Parents:

15f3c3f (diff), e8067c0 (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/lib/drv/generic/driver.c (modified) (2 diffs)

uspace/lib/drv/generic/driver.c

@@ -314 +314 @@
                     " %" PRIun " was found.\n", driver->name, handle);
                 async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        if (fun->conn_handler != NULL) {
+                /* Driver has a custom connection handler. */
+                (*fun->conn_handler)(iid, icall, (void *)fun);
                 return;
         }
@@ -614 +620 @@
                 return ENOMEM;
         
-        match_id->id = match_id_str;
+        match_id->id = str_dup(match_id_str);
         match_id->score = 90;