# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1654447718 -7200
# Node ID 7ac27a50d236e0c47ae350c0a9c511bba34eba4d
# Parent  8328ce61f006fb4009b7cca9da275e93c2ee8233
Removed buffer register restoration from ipc_message_expect, adding it to
ipc_message_wait.

diff -r 8328ce61f006 -r 7ac27a50d236 libipc/lib/src/message.c
--- a/libipc/lib/src/message.c	Fri Jun 03 00:21:10 2022 +0200
+++ b/libipc/lib/src/message.c	Sun Jun 05 18:48:38 2022 +0200
@@ -54,16 +54,7 @@
 
 long ipc_message_expect(ipc_message_t *msg, unsigned int expected_items)
 {
-  long err = ipc_message_expect_capabilities(msg, expected_items);
-
-  if (err)
-    return err;
-
-  /* Restore the buffer registers immediately. */
-
-  ipc_message_restore_buffer_registers(msg);
-
-  return L4_EOK;
+  return ipc_message_expect_capabilities(msg, expected_items);
 }
 
 /* Free capabilities expected in messages. */
@@ -223,6 +214,7 @@
 
 void ipc_message_wait(ipc_message_t *msg, l4_umword_t *label)
 {
+  ipc_message_restore_buffer_registers(msg);
   msg->tag = l4_ipc_wait(l4_utcb(), label, L4_IPC_NEVER);
 }