diff options
| -rw-r--r-- | security/smc/s_version.h | 2 | ||||
| -rw-r--r-- | security/smc/tf_crypto_aes.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/security/smc/s_version.h b/security/smc/s_version.h index 68453ac..2818e19 100644 --- a/security/smc/s_version.h +++ b/security/smc/s_version.h @@ -45,7 +45,7 @@ * defines to set the version number. Else set these values to 0. */ #define S_VERSION_ENG 0 -#define S_VERSION_PATCH 4 +#define S_VERSION_PATCH 6 #ifdef S_VERSION_BUILD /* TRICK: detect if S_VERSION is defined but empty */ diff --git a/security/smc/tf_crypto_aes.c b/security/smc/tf_crypto_aes.c index fb744b1..821bdea 100644 --- a/security/smc/tf_crypto_aes.c +++ b/security/smc/tf_crypto_aes.c @@ -838,14 +838,17 @@ static int aes_dma_start(struct aes_hwa_ctx *ctx) if (!(ctx->next_req->flags & CRYPTO_TFM_REQ_DMA_VISIBLE)) { err = dma_map_sg(NULL, req->src, 1, DMA_TO_DEVICE); - if (!err) + if (!err) { /* Silently fail for now... */ + spin_unlock_irqrestore(&ctx->lock, flags); return 0; + } err = dma_map_sg(NULL, req->dst, 1, DMA_FROM_DEVICE); if (!err) { dma_unmap_sg(NULL, req->src, 1, DMA_TO_DEVICE); /* Silently fail for now... */ + spin_unlock_irqrestore(&ctx->lock, flags); return 0; } |