diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-27 08:17:14 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-27 08:17:14 +0200 |
commit | c97793089b11f736287b65abe3d530d5ffd3857b (patch) | |
tree | 6944831ba049777b40aed51c75bf6dc637cc98e4 /net/qrtr/qrtr.c | |
parent | 9a360a7cae11461ccd933a9ea366b0dcb3afadb0 (diff) | |
parent | 92ed301919932f777713b9172e525674157e983d (diff) |
Merge 5.8-rc7 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/qrtr/qrtr.c')
-rw-r--r-- | net/qrtr/qrtr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c index 24a8c3c6da0d..300a104b9a0f 100644 --- a/net/qrtr/qrtr.c +++ b/net/qrtr/qrtr.c @@ -1180,6 +1180,7 @@ static int qrtr_release(struct socket *sock) sk->sk_state_change(sk); sock_set_flag(sk, SOCK_DEAD); + sock_orphan(sk); sock->sk = NULL; if (!sock_flag(sk, SOCK_ZAPPED)) |