diff --git a/[refs] b/[refs]
index 8163f0eab0d5..b788759e3851 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a99e4e413e1ab9f3c567b5519f5557afd786dc62
+refs/heads/master: ed6f7b10e657b98b4ba89385d02852c8bdf3980e
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
index 22aa3c16ca73..15caf93e4a43 100644
--- a/trunk/kernel/futex.c
+++ b/trunk/kernel/futex.c
@@ -630,8 +630,10 @@ static int futex_wake(u32 __user *uaddr, int nr_wake)
 
 	list_for_each_entry_safe(this, next, head, list) {
 		if (match_futex (&this->key, &key)) {
-			if (this->pi_state)
-				return -EINVAL;
+			if (this->pi_state) {
+				ret = -EINVAL;
+				break;
+			}
 			wake_futex(this);
 			if (++ret >= nr_wake)
 				break;