Changeset e6a78b9 in mainline for uspace/srv/bd/rd/rd.c

Timestamp:

2012-06-29T15:31:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c (diff), 0bbd13e (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/bd/rd/rd.c (modified) (2 diffs)

uspace/srv/bd/rd/rd.c

@@ -106 +106 @@
         if (async_share_out_receive(&callid, &comm_size, &flags)) {
                 (void) async_share_out_finalize(callid, &fs_va);
-                if (fs_va == (void *) -1) {
+                if (fs_va == AS_MAP_FAILED) {
                         async_answer_0(callid, EHANGUP);
                         return;
@@ -237 +237 @@
         async_set_client_connection(rd_connection);
         ret = loc_server_register(NAME);
-        if (ret < 0) {
+        if (ret != EOK) {
                 printf("%s: Unable to register driver (%d)\n", NAME, ret);
                 return false;