---

yaml --- r: 145867 b: refs/heads/master c: a5a2a0c h: refs/heads/master i: 145865: cc59f9b 145863: 11421a6 v: v3
git-mirror · Apr 10, 2009 · ed045f4 · ed045f4
1 parent 2e73c6a
commit ed045f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2de688891909b148efe83a6fc9520a9cd6015f0
+refs/heads/master: a5a2a0c7fa039c59619bc908b3b1ed24734d442a
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
@@ -1668,7 +1668,7 @@ static int futex_wait_setup(u32 __user *uaddr, u32 val, int fshared,
 	q->key = FUTEX_KEY_INIT;
 	ret = get_futex_key(uaddr, fshared, &q->key);
 	if (unlikely(ret != 0))
-		goto out;
+		return ret;
 
 retry_private:
 	*hb = queue_lock(q);