Changeset 5c90e3e in mainline for kernel/generic/src/ipc/ops/connclone.c

Timestamp:

2012-10-18T22:38:27Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

508fff8

Parents:

b801f2d (diff), 7d248e3 (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

File:

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

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

@@ -97 +97 @@
 }
 
-static void answer_cleanup(call_t *answer, ipc_data_t *olddata)
+static int answer_cleanup(call_t *answer, ipc_data_t *olddata)
 {
         int phoneid = (int) IPC_GET_ARG1(*olddata);
@@ -116 +116 @@
         }
         mutex_unlock(&phone->lock);
+
+        return EOK;
 }