| Message ID | 5fe48e8a.e845.1741016074a.Coremail.dinghao.liu@zju.edu.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | crypto: ccree - fix runtime PM imbalance on error | expand |
On Fri, Aug 21, 2020 at 04:15:13PM +0800, dinghao.liu@zju.edu.cn wrote: > 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> > --- > drivers/crypto/ccree/cc_pm.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) Patch applied. Thanks.
diff --git a/drivers/crypto/ccree/cc_pm.c b/drivers/crypto/ccree/cc_pm.c index d39e1664fc7e..3c65bf070c90 100644 --- a/drivers/crypto/ccree/cc_pm.c +++ b/drivers/crypto/ccree/cc_pm.c @@ -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)
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> --- drivers/crypto/ccree/cc_pm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)