staging: ccree: fix unmatched if/else braces

Fix mismatched braces between if and else.

Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/ccree/ssi_buffer_mgr.c b/drivers/staging/ccree/ssi_buffer_mgr.c
index 9e8a1343e9b109286b0c47a6e20f95b3925cb385..f9720fc5dd19cc1452c2bfd51ba0b38f458888ba 100644 (file)
--- a/drivers/staging/ccree/ssi_buffer_mgr.c
+++ b/drivers/staging/ccree/ssi_buffer_mgr.c
@@ -551,8 +551,9 @@ int ssi_buffer_mgr_map_blkcipher_request(
                SSI_LOG_DEBUG("Mapped iv %u B at va=%pK to dma=0x%llX\n",
                        ivsize, info,
                        (unsigned long long)req_ctx->gen_ctx.iv_dma_addr);
-       } else
+       } else {
                req_ctx->gen_ctx.iv_dma_addr = 0;
+       }
 
        /* Map the src SGL */
        rc = ssi_buffer_mgr_map_scatterlist(dev, src,

diff --git a/drivers/staging/ccree/ssi_cipher.c b/drivers/staging/ccree/ssi_cipher.c
index c233b7c722e1bdb9fcf399958531e632dc18bc53..88ed7772c231e65822ec54b579b5f9c9824dd3cc 100644 (file)
--- a/drivers/staging/ccree/ssi_cipher.c
+++ b/drivers/staging/ccree/ssi_cipher.c
@@ -401,8 +401,9 @@ static int ssi_blkcipher_setkey(struct crypto_tfm *tfm,
        /* STAT_PHASE_1: Copy key to ctx */
        dma_sync_single_for_cpu(dev, ctx_p->user.key_dma_addr,
                                        max_key_buf_size, DMA_TO_DEVICE);
-#if SSI_CC_HAS_MULTI2
+
        if (ctx_p->flow_mode == S_DIN_to_MULTI2) {
+#if SSI_CC_HAS_MULTI2
                memcpy(ctx_p->user.key, key, CC_MULTI2_SYSTEM_N_DATA_KEY_SIZE);
                ctx_p->key_round_number = key[CC_MULTI2_SYSTEM_N_DATA_KEY_SIZE];
                if (ctx_p->key_round_number < CC_MULTI2_MIN_NUM_ROUNDS ||
@@ -410,10 +411,8 @@ static int ssi_blkcipher_setkey(struct crypto_tfm *tfm,
                        crypto_tfm_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
                        SSI_LOG_DEBUG("ssi_blkcipher_setkey: SSI_CC_HAS_MULTI2 einval");
                        return -EINVAL;
-               }
-       } else
 #endif /*SSI_CC_HAS_MULTI2*/
-       {
+       } else {
                memcpy(ctx_p->user.key, key, keylen);
                if (keylen == 24)
                        memset(ctx_p->user.key + 24, 0, CC_AES_KEY_SIZE_MAX - 24);