Changeset 94e46c9 in mainline for uspace/srv/devman/drv_conn.c

Timestamp:

2015-05-23T04:09:11Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b5143bd

Parents:

a25d893 (diff), 0683992 (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:

Mainline changes

File:

• uspace/srv/devman/drv_conn.c (modified) (3 diffs)

uspace/srv/devman/drv_conn.c

@@ -173 +173 @@
         callid = async_get_call(&call);
         if (DEVMAN_ADD_MATCH_ID != IPC_GET_IMETHOD(call)) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, 
+                log_msg(LOG_DEFAULT, LVL_ERROR,
                     "Invalid protocol when trying to receive match id.");
-                async_answer_0(callid, EINVAL); 
+                async_answer_0(callid, EINVAL);
                 delete_match_id(match_id);
                 return EINVAL;
@@ -246 +246 @@
         if (ftype != fun_inner && ftype != fun_exposed) {
                 /* Unknown function type */
-                log_msg(LOG_DEFAULT, LVL_ERROR, 
+                log_msg(LOG_DEFAULT, LVL_ERROR,
                     "Unknown function type %d provided by driver.",
                     (int) ftype);
@@ -404 +404 @@
         fibril_rwlock_read_unlock(&device_tree.rwlock);
         
-        rc = fun_offline(fun);
+        rc = fun_online(fun);
         if (rc != EOK) {
                 fun_busy_unlock(fun);