Changeset 8013637 in mainline for uspace/srv/hid/fb/fb.c

Timestamp:

2012-07-20T13:51:28Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8fccd42

Parents:

c5bff3c (diff), 7030bc9 (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:

More mainline changes.

File:

• uspace/srv/hid/fb/fb.c (modified) (3 diffs)

uspace/srv/hid/fb/fb.c

@@ -305 +305 @@
         
         int rc = async_share_out_finalize(callid, &frontbuf->data);
-        if ((rc != EOK) || (frontbuf->data == (void *) -1)) {
+        if ((rc != EOK) || (frontbuf->data == AS_MAP_FAILED)) {
                 free(frontbuf);
                 async_answer_0(iid, ENOMEM);
@@ -348 +348 @@
         
         int rc = async_share_out_finalize(callid, &imagemap->data);
-        if ((rc != EOK) || (imagemap->data == (void *) -1)) {
+        if ((rc != EOK) || (imagemap->data == AS_MAP_FAILED)) {
                 free(imagemap);
                 async_answer_0(iid, ENOMEM);
@@ -990 +990 @@
         int rc = loc_server_register(NAME);
         if (rc != EOK) {
-                printf("%s: Unable to register driver (%d)\n", NAME, rc);
-                return 1;
+                printf("%s: Unable to register driver\n", NAME);
+                return rc;
         }