Changes in kernel/generic/src/ipc/ops/conctmeto.c [022d72ff:466e95f7] in 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;
@@ -51 +49 @@
         /* Set arg5 for server */
         IPC_SET_ARG5(call->data, (sysarg_t) &TASK->phones[newphid]);
+        call->priv = newphid;
 
         return EOK;
@@ -74 +73 @@
 static int answer_process(call_t *answer)
 {
-        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);
-        }
+        if (IPC_GET_RETVAL(answer->data))
+                phone_dealloc(answer->priv);
+        else
+                IPC_SET_ARG5(answer->data, answer->priv);
         
         return EOK;