From 9f05260287c55f9d264958398fe8f61fe000330f Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Sun, 21 Oct 2012 19:56:42 +0800 Subject: [PATCH] --- yaml --- r: 344379 b: refs/heads/master c: 3200da8d9afb3d0dc617515a2fe364d9d59ef523 h: refs/heads/master i: 344377: 54bfd9598c9ad7d69d5df10c77a36e022d520d5f 344375: 82cf8d1f587350bd8985709fa8faf5ed67233874 v: v3 --- [refs] | 2 +- trunk/drivers/crypto/tegra-aes.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5da6b46be76b..aedfd08c183e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c12ab20b162c9414acadc18c6da6cfd3eea54b7b +refs/heads/master: 3200da8d9afb3d0dc617515a2fe364d9d59ef523 diff --git a/trunk/drivers/crypto/tegra-aes.c b/trunk/drivers/crypto/tegra-aes.c index 37185e6630cd..19adf1c7faa2 100644 --- a/trunk/drivers/crypto/tegra-aes.c +++ b/trunk/drivers/crypto/tegra-aes.c @@ -674,8 +674,10 @@ static int tegra_aes_get_random(struct crypto_rng *tfm, u8 *rdata, mutex_lock(&aes_lock); ret = clk_prepare_enable(dd->aes_clk); - if (ret) + if (ret) { + mutex_unlock(&aes_lock); return ret; + } ctx->dd = dd; dd->ctx = ctx; @@ -759,8 +761,10 @@ static int tegra_aes_rng_reset(struct crypto_rng *tfm, u8 *seed, dd->flags = FLAGS_ENCRYPT | FLAGS_RNG; ret = clk_prepare_enable(dd->aes_clk); - if (ret) + if (ret) { + mutex_unlock(&aes_lock); return ret; + } aes_set_key(dd);