Changeset 97c7682 in mainline for uspace/srv/hid/input/generic/input.c

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/srv/hid/input/generic/input.c (modified) (2 diffs)

uspace/srv/hid/input/generic/input.c

@@ -662 +662 @@
         async_set_client_connection(client_connection);
         int rc = loc_server_register(NAME);
-        if (rc < 0) {
-                printf("%s: Unable to register server (%d)\n", NAME, rc);
-                return -1;
+        if (rc != EOK) {
+                printf("%s: Unable to register server\n", NAME);
+                return rc;
         }
         
@@ -671 +671 @@
         
         service_id_t service_id;
-        if (loc_service_register(kbd, &service_id) != EOK) {
+        rc = loc_service_register(kbd, &service_id);
+        if (rc != EOK) {
                 printf("%s: Unable to register service %s\n", NAME, kbd);
-                return -1;
+                return rc;
         }