lkml.org 
[lkml]   [2020]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 03/38] ASoC: img-parallel-out: Fix a reference count leak
    Date
    From: Qiushi Wu <wu000273@umn.edu>

    [ Upstream commit 6b9fbb073636906eee9fe4d4c05a4f445b9e2a23 ]

    pm_runtime_get_sync() increments the runtime PM usage counter even
    when it returns an error code, causing incorrect ref count if
    pm_runtime_put_noidle() is not called in error handling paths.
    Thus call pm_runtime_put_noidle() if pm_runtime_get_sync() fails.

    Signed-off-by: Qiushi Wu <wu000273@umn.edu>
    Link: https://lore.kernel.org/r/20200614033344.1814-1-wu000273@umn.edu
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/img/img-parallel-out.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/sound/soc/img/img-parallel-out.c b/sound/soc/img/img-parallel-out.c
    index acc005217be06..f56752662b199 100644
    --- a/sound/soc/img/img-parallel-out.c
    +++ b/sound/soc/img/img-parallel-out.c
    @@ -166,8 +166,10 @@ static int img_prl_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
    }

    ret = pm_runtime_get_sync(prl->dev);
    - if (ret < 0)
    + if (ret < 0) {
    + pm_runtime_put_noidle(prl->dev);
    return ret;
    + }

    reg = img_prl_out_readl(prl, IMG_PRL_OUT_CTL);
    reg = (reg & ~IMG_PRL_OUT_CTL_EDGE_MASK) | control_set;
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-08-21 19:06    [W:4.046 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site