diff --git a/[refs] b/[refs] index 924bac496370..ea2b15ea9a2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87588dd6663b6f306f03f2deaec0d0fd3f0cb26e +refs/heads/master: f50cadaa8ffa72ad430e5beabe02eb752f3f72a3 diff --git a/trunk/fs/signalfd.c b/trunk/fs/signalfd.c index 3b07f26d984d..7b941abbcde0 100644 --- a/trunk/fs/signalfd.c +++ b/trunk/fs/signalfd.c @@ -320,7 +320,7 @@ asmlinkage long sys_signalfd(int ufd, sigset_t __user *user_mask, size_t sizemas if (sizemask != sizeof(sigset_t) || copy_from_user(&sigmask, user_mask, sizeof(sigmask))) - return error = -EINVAL; + return -EINVAL; sigdelsetmask(&sigmask, sigmask(SIGKILL) | sigmask(SIGSTOP)); signotset(&sigmask);