lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 407/862] ASoC: stm: Fix PM disable depth imbalance in stm32_i2s_probe
    Date
    From: Zhang Qilong <zhangqilong3@huawei.com>

    [ Upstream commit 93618e5e05a3ce4aa6750268c5025bdb4cb7dc6e ]

    The pm_runtime_enable will increase power disable depth. Thus
    a pairing decrement is needed on the error handling path to
    keep it balanced according to context. We fix it by moving
    pm_runtime_enable to the endding of stm32_i2s_probe.

    Fixes:32a956a1fadf ("ASoC: stm32: i2s: add pm_runtime support")

    Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
    Reviewed-by: Olivier Moysan <olivier.moysan@foss.st.com>
    Link: https://lore.kernel.org/r/20220927142640.64647-1-zhangqilong3@huawei.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/stm/stm32_i2s.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c
    index 6aafe793eec4..ce7f6942308f 100644
    --- a/sound/soc/stm/stm32_i2s.c
    +++ b/sound/soc/stm/stm32_i2s.c
    @@ -1136,8 +1136,6 @@ static int stm32_i2s_probe(struct platform_device *pdev)
    return dev_err_probe(&pdev->dev, PTR_ERR(i2s->regmap),
    "Regmap init error\n");

    - pm_runtime_enable(&pdev->dev);
    -
    ret = snd_dmaengine_pcm_register(&pdev->dev, &stm32_i2s_pcm_config, 0);
    if (ret)
    return dev_err_probe(&pdev->dev, ret, "PCM DMA register error\n");
    @@ -1180,6 +1178,8 @@ static int stm32_i2s_probe(struct platform_device *pdev)
    FIELD_GET(I2S_VERR_MIN_MASK, val));
    }

    + pm_runtime_enable(&pdev->dev);
    +
    return ret;

    error:
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 15:48    [W:3.498 / U:1.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site