summaryrefslogtreecommitdiff
path: root/drivers/crypto
diff options
context:
space:
mode:
authorZhang Qilong <zhangqilong3@huawei.com>2020-11-13 21:17:28 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-29 13:44:55 +0100
commitfc23519181926bb0818dabe55cb0b364f34f4e0f (patch)
tree83ba8e32f299a265e68f1e0c67164e9b99b22347 /drivers/crypto
parent9314c996c137fbe33347922946f41143e6ff2794 (diff)
downloadlinux-fc23519181926bb0818dabe55cb0b364f34f4e0f.tar.gz
linux-fc23519181926bb0818dabe55cb0b364f34f4e0f.tar.bz2
linux-fc23519181926bb0818dabe55cb0b364f34f4e0f.zip
crypto: omap-aes - Fix PM disable depth imbalance in omap_aes_probe
[ Upstream commit ff8107200367f4abe0e5bce66a245e8d0f2d229e ] The pm_runtime_enable will increase power disable depth. Thus a pairing decrement is needed on the error handling path to keep it balanced according to context. Fixes: f7b2b5dd6a62a ("crypto: omap-aes - add error check for pm_runtime_get_sync") Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/omap-aes.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index fe32dd95ae4f..a2d5ba0a0d5a 100644
--- a/drivers/crypto/omap-aes.c
+++ b/drivers/crypto/omap-aes.c
@@ -1172,7 +1172,7 @@ static int omap_aes_probe(struct platform_device *pdev)
if (err < 0) {
dev_err(dev, "%s: failed to get_sync(%d)\n",
__func__, err);
- goto err_res;
+ goto err_pm_disable;
}
omap_aes_dma_stop(dd);
@@ -1257,6 +1257,7 @@ err_engine:
omap_aes_dma_cleanup(dd);
err_irq:
tasklet_kill(&dd->done_task);
+err_pm_disable:
pm_runtime_disable(dev);
err_res:
dd = NULL;