1 files changed, 6 insertions, 6 deletions

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 95c514a1d7d9..934947f038b6 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1318,12 +1318,12 @@ static int tipc_wait_for_rcvmsg(struct socket *sock, long *timeop)
                 err = 0;
                 if (!skb_queue_empty(&sk->sk_receive_queue))
                         break;
-                err = sock_intr_errno(timeo);
-                if (signal_pending(current))
-                        break;
                 err = -EAGAIN;
                 if (!timeo)
                         break;
+                err = sock_intr_errno(timeo);
+                if (signal_pending(current))
+                        break;
         }
         finish_wait(sk_sleep(sk), &wait);
         *timeop = timeo;
@@ -2026,12 +2026,12 @@ static int tipc_wait_for_accept(struct socket *sock, long timeo)
                 err = -EINVAL;
                 if (sock->state != SS_LISTENING)
                         break;
-                err = sock_intr_errno(timeo);
-                if (signal_pending(current))
-                        break;
                 err = -EAGAIN;
                 if (!timeo)
                         break;
+                err = sock_intr_errno(timeo);
+                if (signal_pending(current))
+                        break;
         }
         finish_wait(sk_sleep(sk), &wait);
         return err;