Changeset 132ab5d1 in mainline for kernel/generic/src/ipc/ops/conctmeto.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• kernel/generic/src/ipc/ops/conctmeto.c (modified) (2 diffs)

kernel/generic/src/ipc/ops/conctmeto.c

@@ -42 +42 @@
 static int request_preprocess(call_t *call, phone_t *phone)
 {
-        cap_handle_t phone_handle = phone_alloc(TASK);
+        cap_handle_t phone_handle;
+        int rc = phone_alloc(TASK, &phone_handle);
 
-        /* Remember the phone capability or the error. */
-        call->priv = phone_handle;
-        if (phone_handle < 0)
-                return phone_handle;
+        /* Remember the phone capability or that an error occured. */
+        call->priv = (rc == EOK) ? phone_handle : -1;
+
+        if (rc != EOK) {
+                return rc;
+        }
 
         /* Set arg5 for server */
@@ -61 +64 @@
 {
         cap_handle_t phone_handle = (cap_handle_t) call->priv;
+
+        if (phone_handle < 0) {
+                return EOK;
+        }
+
         phone_dealloc(phone_handle);
         /* Hand over reference from ARG5 to phone->kobject */