1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/misc/sgi-xp/xpc_channel.c b/drivers/misc/sgi-xp/xpc_channel.c
index 45fd653dbe3..99a2534c38a 100644
--- a/drivers/misc/sgi-xp/xpc_channel.c
+++ b/drivers/misc/sgi-xp/xpc_channel.c
@@ -183,6 +183,7 @@ xpc_process_openclose_chctl_flags(struct xpc_partition *part, int ch_number,
             &part->remote_openclose_args[ch_number];
         struct xpc_channel *ch = &part->channels[ch_number];
         enum xp_retval reason;
+        enum xp_retval ret;
 
         spin_lock_irqsave(&ch->lock, irq_flags);
 
@@ -399,8 +400,13 @@ again:
                 DBUG_ON(args->local_nentries == 0);
                 DBUG_ON(args->remote_nentries == 0);
 
+                ret = xpc_save_remote_msgqueue_pa(ch, args->local_msgqueue_pa);
+                if (ret != xpSuccess) {
+                        XPC_DISCONNECT_CHANNEL(ch, ret, &irq_flags);
+                        spin_unlock_irqrestore(&ch->lock, irq_flags);
+                        return;
+                }
                 ch->flags |= XPC_C_ROPENREPLY;
-                xpc_save_remote_msgqueue_pa(ch, args->local_msgqueue_pa);
 
                 if (args->local_nentries < ch->remote_nentries) {
                         dev_dbg(xpc_chan, "XPC_CHCTL_OPENREPLY: new "