Merge remote-tracking branch 'livepatching/for-next'

[linux] / drivers / crypto / omap-des.c

diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
index 6369019..1ba2633 100644 (file)
--- a/drivers/crypto/omap-des.c
+++ b/drivers/crypto/omap-des.c
@@ -662,7 +662,7 @@ static int omap_des_setkey(struct crypto_ablkcipher *cipher, const u8 *key,
        pr_debug("enter, keylen: %d\n", keylen);
 
        /* Do we need to test against weak key? */
-       if (tfm->crt_flags & CRYPTO_TFM_REQ_WEAK_KEY) {
+       if (tfm->crt_flags & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS) {
                u32 tmp[DES_EXPKEY_WORDS];
                int ret = des_ekey(tmp, key);