diff options
| author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2020-10-30 11:48:17 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyuw@linux.intel.com> | 2020-10-30 11:48:17 +0800 |
| commit | 4a95857a875e887cc958c92fe9d2cde6184d2ec0 (patch) | |
| tree | 8d67b681d582ba7ee11a359be7af82ed77bd6620 /net/unix/af_unix.c | |
| parent | baec997285e63ad3e03d8b8d45e14776cd737f62 (diff) | |
| parent | 61334ed227a5852100115180f5535b1396ed5227 (diff) | |
Merge tag 'drm-intel-fixes-2020-10-29' into gvt-fixes
Backmerge for 5.10-rc1 to apply one extra APL fix.
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 92784e51ee7d..41c3303c3357 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -613,7 +613,6 @@ static int unix_listen(struct socket *sock, int backlog) int err; struct sock *sk = sock->sk; struct unix_sock *u = unix_sk(sk); - struct pid *old_pid = NULL; err = -EOPNOTSUPP; if (sock->type != SOCK_STREAM && sock->type != SOCK_SEQPACKET) @@ -634,7 +633,6 @@ static int unix_listen(struct socket *sock, int backlog) out_unlock: unix_state_unlock(sk); - put_pid(old_pid); out: return err; } @@ -878,7 +876,6 @@ static int unix_autobind(struct socket *sock) if (err) return err; - err = 0; if (u->addr) goto out; |