diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-02 22:54:00 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-02 22:54:00 +0100 |
| commit | e2160156bf2a7d5018e99a9993fbcdda0abac09b (patch) | |
| tree | 1a70cb13dcfa7ade4c48d8a64d20543abebfb1dc /crypto/algapi.c | |
| parent | net: phy: broadcom: rehook BCM54612E specific init (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-e2160156bf2a7d5018e99a9993fbcdda0abac09b.tar.xz linux-e2160156bf2a7d5018e99a9993fbcdda0abac09b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
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; |