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

Timestamp:

2015-07-28T11:28:14Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6accc5cf

Parents:

df2bce32 (diff), 47726b5e (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 from the mainline

File:

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

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

@@ -44 +44 @@
         int newphid = phone_alloc(TASK);
 
+        /* Remember the phoneid or the error. */
+        call->priv = newphid;
         if (newphid < 0)
                 return ELIMIT;
@@ -49 +51 @@
         /* Set arg5 for server */
         IPC_SET_ARG5(call->data, (sysarg_t) &TASK->phones[newphid]);
-        call->priv = newphid;
 
         return EOK;
@@ -73 +74 @@
 static int answer_process(call_t *answer)
 {
-        if (IPC_GET_RETVAL(answer->data))
-                phone_dealloc(answer->priv);
-        else
-                IPC_SET_ARG5(answer->data, answer->priv);
+        int newphid = (int) answer->priv;
+
+        if (IPC_GET_RETVAL(answer->data)) {
+                if (newphid >= 0) {
+                        /*
+                         * The phone was indeed allocated and now needs
+                         * to be deallocated.
+                         */
+                        phone_dealloc(newphid);
+                }
+        } else {
+                IPC_SET_ARG5(answer->data, newphid);
+        }
         
         return EOK;