Changeset 4265fd4 in mainline

Timestamp:

2011-03-30T13:16:25Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0876062

Parents:

4ae90f9

Message:

More robust error checking in devman client

Add checking for failure during sending of match ids.

printf() removed because that is not allowed inside serialized section.

File:

• uspace/lib/c/generic/devman.c (modified) (3 diffs)

uspace/lib/c/generic/devman.c

@@ -147 +147 @@
                 ret = devman_send_match_id(phone, match_id);
                 if (ret != EOK) {
-                        printf("Driver failed to send match id, error %d\n",
-                            ret);
                         return ret;
                 }
@@ -195 +193 @@
         }
         
-        devman_send_match_ids(phone, match_ids);
+        int match_ids_rc = devman_send_match_ids(phone, match_ids);
         
         async_wait_for(req, &retval);
@@ -201 +199 @@
         async_serialize_end();
         
+        /* Prefer the answer to DEVMAN_ADD_FUNCTION in case of errors. */
+        if ((match_ids_rc != EOK) && (retval == EOK)) {
+                retval = match_ids_rc;
+        }
+
         if (retval == EOK)
                 fun_handle = (int) IPC_GET_ARG1(answer);