Changeset 8b36bf2 in mainline for uspace/srv/hid/fb/fb.c

Timestamp:

2012-06-20T23:03:29Z (11 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

d5070ef

Parents:

8375d0eb (diff), 6eef3c4 (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/hid/fb/fb.c (modified) (2 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);