]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
crypto: ccree - fix runtime PM imbalance on error
authordinghao.liu@zju.edu.cn <dinghao.liu@zju.edu.cn>
Fri, 21 Aug 2020 08:15:13 +0000 (16:15 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Oct 2020 09:07:18 +0000 (10:07 +0100)
[ Upstream commit b7b57a5643c2ae45afe6aa5e73363b553cacd14b ]

pm_runtime_get_sync() increments the runtime PM usage counter
even when it returns an error code. However, users of cc_pm_get(),
a direct wrapper of pm_runtime_get_sync(), assume that PM usage
counter will not change on error. Thus a pairing decrement is needed
on the error handling path to keep the counter balanced.

Fixes: 8c7849a30255c ("crypto: ccree - simplify Runtime PM handling")
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/crypto/ccree/cc_pm.c

index d39e1664fc7edfd32842e45e4cae2f9f22838bec..3c65bf070c908dd672572075faa4a383ae3766de 100644 (file)
@@ -65,8 +65,12 @@ const struct dev_pm_ops ccree_pm = {
 int cc_pm_get(struct device *dev)
 {
        int rc = pm_runtime_get_sync(dev);
+       if (rc < 0) {
+               pm_runtime_put_noidle(dev);
+               return rc;
+       }
 
-       return (rc == 1 ? 0 : rc);
+       return 0;
 }
 
 void cc_pm_put_suspend(struct device *dev)