From eae51dda5900645dcfee1d2eaf9f1479fb3e9cd8 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 5 Dec 2007 15:46:09 +0100
Subject: [PATCH] --- yaml --- r: 74650 b: refs/heads/master c:
 cde898fa80a45bb23eab2a060fc79d0913081409 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/kernel/futex.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 81831e08ff4b..437c2b58616f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54561783ee99d73a086f3abbda3e44f87f6bf65b
+refs/heads/master: cde898fa80a45bb23eab2a060fc79d0913081409
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
index e8fbdd7d95ac..172a1aeeafdb 100644
--- a/trunk/kernel/futex.c
+++ b/trunk/kernel/futex.c
@@ -658,7 +658,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this)
 
 		if (curval == -EFAULT)
 			ret = -EFAULT;
-		if (curval != uval)
+		else if (curval != uval)
 			ret = -EINVAL;
 		if (ret) {
 			spin_unlock(&pi_state->pi_mutex.wait_lock);