diff options
| author | David S. Miller <davem@davemloft.net> | 2018-07-30 09:10:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-30 09:10:25 -0700 |
| commit | 4f1af36439d332d31c8aa5624f2c5a9095751c37 (patch) | |
| tree | adc5042e2f6860955812501e64edc80e82e848af | |
| parent | 544545e88de8a0b644b13b740b307a2f10ee0f40 (diff) | |
| parent | 68572be439121cad11722a67001872f38c2bbc85 (diff) | |
| download | linux-crypto-4f1af36439d332d31c8aa5624f2c5a9095751c37.tar.gz linux-crypto-4f1af36439d332d31c8aa5624f2c5a9095751c37.zip | |
Merge branch 'socket-poll-related-cleanups-v2'
Christoph Hellwig says:
====================
socket poll related cleanups v2
A couple of cleanups I stumbled upon when studying the networking
poll code.
Changes since v1:
- drop a dispute patch from this series (to be sent separately)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | crypto/af_alg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index c166f424..b053179e 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -1071,7 +1071,7 @@ __poll_t af_alg_poll(struct file *file, struct socket *sock, struct af_alg_ctx *ctx = ask->private; __poll_t mask; - sock_poll_wait(file, sk_sleep(sk), wait); + sock_poll_wait(file, wait); mask = 0; if (!ctx->more || ctx->used) |