From f6049b53f90b8c102669b9113837bfe5579bdbdf Mon Sep 17 00:00:00 2001
From: Stanislav Kinsbursky <skinsbursky@parallels.com>
Date: Fri, 4 Jan 2013 15:34:47 -0800
Subject: [PATCH] --- yaml --- r: 348266 b: refs/heads/master c:
 9afdacda0252fc1ddb7907728e878518edbcdfce h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/ipc/msg.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 921b18b94fb5..9f92027bbc57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d79cf8a9dfbaef1e57c88a709689577c8482a17
+refs/heads/master: 9afdacda0252fc1ddb7907728e878518edbcdfce
diff --git a/trunk/ipc/msg.c b/trunk/ipc/msg.c
index a71af5a65abf..2f272fa76595 100644
--- a/trunk/ipc/msg.c
+++ b/trunk/ipc/msg.c
@@ -793,12 +793,9 @@ long do_msgrcv(int msqid, long *pmtype, void __user *mtext,
 				msg = walk_msg;
 				if (mode == SEARCH_LESSEQUAL &&
 						walk_msg->m_type != 1) {
-					msg = walk_msg;
 					msgtyp = walk_msg->m_type - 1;
-				} else {
-					msg = walk_msg;
+				} else
 					break;
-				}
 			}
 			tmp = tmp->next;
 		}