diff --git a/[refs] b/[refs] index 045010436d85..e872e5fc0b53 100644 --- 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 index 041bf3ac4be9..6d2daa46f9ff 100644 --- 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);