diff options
author | 2020-10-15 20:37:01 +0200 | |
---|---|---|
committer | 2020-10-15 20:37:01 +0200 | |
commit | 62b31a045757eac81fed94b19df47418a0818528 (patch) | |
tree | 285fda56df8304dff6ba929bad65ddfb4e4fd726 /net/unix/af_unix.c | |
parent | Merge branch 'for-5.10/apple' into for-linus (diff) | |
parent | HID: hid-debug: fix nonblocking read semantics wrt EIO/ERESTARTSYS (diff) | |
download | linux-dev-62b31a045757eac81fed94b19df47418a0818528.tar.xz linux-dev-62b31a045757eac81fed94b19df47418a0818528.zip |
Merge branch 'for-5.10/core' into for-linus
- nonblocking read semantics fix for hid-debug
Diffstat (limited to 'net/unix/af_unix.c')
-rw-r--r-- | net/unix/af_unix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 181ea6fb56a6..92784e51ee7d 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -837,7 +837,7 @@ static int unix_create(struct net *net, struct socket *sock, int protocol, */ case SOCK_RAW: sock->type = SOCK_DGRAM; - /* fall through */ + fallthrough; case SOCK_DGRAM: sock->ops = &unix_dgram_ops; break; |