diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-01-26 13:33:39 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-01-26 13:33:39 +0100 |
commit | e39b1f7c2c1e0f2f0077b12287b5938206a24ea1 (patch) | |
tree | db9fa1382c505ed31a78e346c6667868b9319b9b /crypto/af_alg.c | |
parent | ad8b05dfadb938841880a3c05fd76e51af30b1f1 (diff) | |
parent | 9ed6fbbed6c0edbd66c948e4e3a4036695f11f5f (diff) | |
download | linux-crypto-e39b1f7c2c1e0f2f0077b12287b5938206a24ea1.tar.gz linux-crypto-e39b1f7c2c1e0f2f0077b12287b5938206a24ea1.zip |
Merge tag 'asoc-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.19
There's a lot more fixes here than I'd like since I've been lax in
sending things throughout the release cycle but there's only two in
generic code and they've had quite some time to cook in -next so
hopefully on balance are OK.
The two generic fixes are a fix for crashes on capture DAIs in the
compress code and a fix for error handling on probe failures which would
have been harmless in the past but now oopses with the new dynamic probe
code.
Diffstat (limited to '')
-rw-r--r-- | crypto/af_alg.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 1fa7bc31..4665b79c 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -455,6 +455,9 @@ void af_alg_complete(struct crypto_async_request *req, int err) { struct af_alg_completion *completion = req->data; + if (err == -EINPROGRESS) + return; + completion->err = err; complete(&completion->completion); } |