lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 108/633] crypto: ccree - fix runtime PM imbalance on error
    Date
    From: dinghao.liu@zju.edu.cn <dinghao.liu@zju.edu.cn>

    [ 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 | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/crypto/ccree/cc_pm.c b/drivers/crypto/ccree/cc_pm.c
    index d39e1664fc7ed..3c65bf070c908 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)
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 18:24    [W:2.385 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site