1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg_qi.c
index 6e61cc93c2b0..d7aa7d7ff102 100644
--- a/drivers/crypto/caam/caamalg_qi.c
+++ b/drivers/crypto/caam/caamalg_qi.c
@@ -679,10 +679,8 @@ static int xts_ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,
         int ret = 0;
 
         if (keylen != 2 * AES_MIN_KEY_SIZE  && keylen != 2 * AES_MAX_KEY_SIZE) {
-                crypto_ablkcipher_set_flags(ablkcipher,
-                                            CRYPTO_TFM_RES_BAD_KEY_LEN);
                 dev_err(jrdev, "key size mismatch\n");
-                return -EINVAL;
+                goto badkey;
         }
 
         ctx->cdata.keylen = keylen;
@@ -715,7 +713,7 @@ static int xts_ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,
         return ret;
 badkey:
         crypto_ablkcipher_set_flags(ablkcipher, CRYPTO_TFM_RES_BAD_KEY_LEN);
-        return 0;
+        return -EINVAL;
 }
 
 /*