arm: dts: rk3288-android: add nand support

[firefly-linux-kernel-4.4.55.git] / crypto / algapi.c

diff --git a/crypto/algapi.c b/crypto/algapi.c
index d130b41dbaea244000c35328d7eba7b463158bc8..43f5bdb6b57084e35e065dc28935f0869c258bac 100644 (file)
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -345,7 +345,7 @@ static void crypto_wait_for_test(struct crypto_larval *larval)
                crypto_alg_tested(larval->alg.cra_driver_name, 0);
        }
 
-       err = wait_for_completion_interruptible(&larval->completion);
+       err = wait_for_completion_killable(&larval->completion);
        WARN_ON(err);
 
 out:
@@ -357,6 +357,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;