diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-02-28 13:30:55 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-02-28 13:30:55 +0100 |
| commit | 70395a96bd882d8dba669f99b5cec0008690accd (patch) | |
| tree | 37f3a4c2cf35828f153f3ce59c3daa4f39241c32 /crypto | |
| parent | f97a0944a72b26a2bece72516294e112a890f98a (diff) | |
| parent | 3146089d235b304e665dc551472ae9cb9ab58572 (diff) | |
| download | linux-70395a96bd882d8dba669f99b5cec0008690accd.tar.bz2 | |
Merge tag 'asoc-v5.1-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More changes for v5.1
Another batch of changes for ASoC, no big core changes - it's mainly
small fixes and improvements for individual drivers.
- A big refresh and cleanup of the Samsung drivers, fixing a number of
issues which allow the driver to be used with a wider range of
userspaces.
- Fixes for the Intel drivers to make them more standard so less likely
to get bitten by core issues.
- New driver for Cirrus Logic CS35L26.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/af_alg.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 17eb09d222ff..ec78a04eb136 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -122,8 +122,10 @@ static void alg_do_release(const struct af_alg_type *type, void *private) int af_alg_release(struct socket *sock) { - if (sock->sk) + if (sock->sk) { sock_put(sock->sk); + sock->sk = NULL; + } return 0; } EXPORT_SYMBOL_GPL(af_alg_release); |