crypto: stm32 - Revert broken pm_runtime_resume_and_get changes

We should not call pm_runtime_resume_and_get where the reference
count is expected to be incremented unconditionally.  This patch
reverts these calls to the original unconditional get_sync call.

Reported-by: Heiner Kallweit <hkallweit1@gmail.com>
Fixes: 747bf30fd944 ("crypto: stm32/cryp - Fix PM reference leak...")
Fixes: 1cb3ad701970 ("crypto: stm32/hash - Fix PM reference leak...")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/stm32/stm32-cryp.c b/drivers/crypto/stm32/stm32-cryp.c
index c6640f616d8d1dba1f75840f29b2d04523d48d83..59ef541123ae62d9bf29ffbe20462a079fafc312 100644 (file)
--- a/drivers/crypto/stm32/stm32-cryp.c
+++ b/drivers/crypto/stm32/stm32-cryp.c
@@ -534,7 +534,8 @@ static int stm32_cryp_hw_init(struct stm32_cryp *cryp)
 {
        int ret;
        u32 cfg, hw_mode;
-       pm_runtime_resume_and_get(cryp->dev);
+
+       pm_runtime_get_sync(cryp->dev);
 
        /* Disable interrupt */
        stm32_cryp_write(cryp, CRYP_IMSCR, 0);

diff --git a/drivers/crypto/stm32/stm32-hash.c b/drivers/crypto/stm32/stm32-hash.c
index 389de9e3302d5658c92e1eb5c7cc3cc4f100a2ac..d33006d43f761b2b3dafd68ad888dd7b71b80a04 100644 (file)
--- a/drivers/crypto/stm32/stm32-hash.c
+++ b/drivers/crypto/stm32/stm32-hash.c
@@ -813,7 +813,7 @@ static void stm32_hash_finish_req(struct ahash_request *req, int err)
 static int stm32_hash_hw_init(struct stm32_hash_dev *hdev,
                              struct stm32_hash_request_ctx *rctx)
 {
-       pm_runtime_resume_and_get(hdev->dev);
+       pm_runtime_get_sync(hdev->dev);
 
        if (!(HASH_FLAGS_INIT & hdev->flags)) {
                stm32_hash_write(hdev, HASH_CR, HASH_CR_INIT);
@@ -962,7 +962,7 @@ static int stm32_hash_export(struct ahash_request *req, void *out)
        u32 *preg;
        unsigned int i;
 
-       pm_runtime_resume_and_get(hdev->dev);
+       pm_runtime_get_sync(hdev->dev);
 
        while ((stm32_hash_read(hdev, HASH_SR) & HASH_SR_BUSY))
                cpu_relax();
@@ -1000,7 +1000,7 @@ static int stm32_hash_import(struct ahash_request *req, const void *in)
 
        preg = rctx->hw_context;
 
-       pm_runtime_resume_and_get(hdev->dev);
+       pm_runtime_get_sync(hdev->dev);
 
        stm32_hash_write(hdev, HASH_IMR, *preg++);
        stm32_hash_write(hdev, HASH_STR, *preg++);