diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2017-02-03 18:14:10 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-02-03 18:14:10 +0800 |
| commit | 34cb58213948a0c26a228da903a3b37c2505843c (patch) | |
| tree | 21970a3387c406654a13774b9ffab36744cea8ea /crypto/algapi.c | |
| parent | 7dede913fc2ab9c0d3bff3a49e26fa9e858b0c13 (diff) | |
| parent | 7c2cf1c4615cc2f576d0604406cdf0065f00b83b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pick up arm64 output IV patch.
Diffstat (limited to 'crypto/algapi.c')
| -rw-r--r-- | crypto/algapi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c index df939b54b09f..1fad2a6b3bbb 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -356,6 +356,7 @@ int crypto_register_alg(struct crypto_alg *alg) struct crypto_larval *larval; int err; + alg->cra_flags &= ~CRYPTO_ALG_DEAD; err = crypto_check_alg(alg); if (err) return err; |