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 | 53a80d54383ff98efadbfee75032a8370ac7bd0b (patch) | |
| tree | f16bb72061f4e203570eed1ee0560560f065f0e2 /crypto/algapi.c | |
| parent | 76c28e1b1d4c849638e307239e7c43d67f0a3197 (diff) | |
| parent | 108b5beb5d963af51f9035856c9be57c1fbbbe14 (diff) | |
| download | linux-crypto-53a80d54383ff98efadbfee75032a8370ac7bd0b.tar.gz linux-crypto-53a80d54383ff98efadbfee75032a8370ac7bd0b.zip | |
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 df939b54..1fad2a6b 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; |