Index: libipc/generic/ipc.c
===================================================================
--- libipc/generic/ipc.c	(revision d73942cecc6f4f79f742d7a243cb57cffc219ceb)
+++ libipc/generic/ipc.c	(revision aa59fa038704679a25298dc08da7b9f8dac2e27d)
@@ -118,4 +118,5 @@
 	if (!call) {
 		callback(private, ENOMEM, NULL);
+		return;
 	}
 		
@@ -222,5 +223,5 @@
  *         IPC_WAIT_NONBLOCKING
  */
-int ipc_wait_for_call(ipc_call_t *call, int flags)
+ipc_callid_t ipc_wait_for_call(ipc_call_t *call, int flags)
 {
 	ipc_callid_t callid;
@@ -237,2 +238,10 @@
 	return callid;
 }
+
+/** Ask destination to do a callback connection */
+int ipc_connect_to_me(int phoneid, int arg1, int arg2,
+		      unsigned long long *taskid)
+{
+	return __SYSCALL4(SYS_IPC_CONNECT_TO_ME, phoneid, arg1, arg2,
+			  (sysarg_t) taskid);
+}