diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-01-06 17:31:06 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-01-06 17:31:06 -0800 |
commit | cc6c016e15be5b8f5130d170fb6a0f10f2722e4f (patch) | |
tree | bc4fdece4a3e12a3727c3f9fffe66bbed8ed6313 /crypto/algif_skcipher.c | |
parent | ef0902bd956672dc33d6f7dd7bcaff9f769ac5c3 (diff) | |
parent | b1d13cb9d87a3d25f79388d8db914a482ce5b3b7 (diff) | |
download | linux-crypto-cc6c016e15be5b8f5130d170fb6a0f10f2722e4f.tar.gz linux-crypto-cc6c016e15be5b8f5130d170fb6a0f10f2722e4f.zip |
Merge branch 'goodix' into next
Merge several improvements to Goodix touchscreen driver:
- power management support
- configuration upload
- axis swapping and inversion
Diffstat (limited to 'crypto/algif_skcipher.c')
-rw-r--r-- | crypto/algif_skcipher.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index af31a0ee..ca9efe17 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -212,7 +212,7 @@ static int skcipher_wait_for_wmem(struct sock *sk, unsigned flags) if (flags & MSG_DONTWAIT) return -EAGAIN; - set_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags); + sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk); for (;;) { if (signal_pending(current)) @@ -258,7 +258,7 @@ static int skcipher_wait_for_data(struct sock *sk, unsigned flags) return -EAGAIN; } - set_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags); + sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk); for (;;) { if (signal_pending(current)) @@ -272,7 +272,7 @@ static int skcipher_wait_for_data(struct sock *sk, unsigned flags) } finish_wait(sk_sleep(sk), &wait); - clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags); + sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk); return err; } |