lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 241/530] ASoC: wm8997: Fix PM disable depth imbalance in wm8997_probe
    Date
    From: Zhang Qilong <zhangqilong3@huawei.com>

    [ Upstream commit 41a736ac20602f64773e80f0f5b32cde1830a44a ]

    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 wm8997_probe

    Fixes:40843aea5a9bd ("ASoC: wm8997: Initial CODEC driver")

    Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
    Link: https://lore.kernel.org/r/20220928160116.125020-2-zhangqilong3@huawei.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/wm8997.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
    index 38ef631d1a1f..c8c711e555c0 100644
    --- a/sound/soc/codecs/wm8997.c
    +++ b/sound/soc/codecs/wm8997.c
    @@ -1162,9 +1162,6 @@ static int wm8997_probe(struct platform_device *pdev)
    regmap_update_bits(arizona->regmap, wm8997_digital_vu[i],
    WM8997_DIG_VU, WM8997_DIG_VU);

    - pm_runtime_enable(&pdev->dev);
    - pm_runtime_idle(&pdev->dev);
    -
    arizona_init_common(arizona);

    ret = arizona_init_vol_limit(arizona);
    @@ -1183,6 +1180,9 @@ static int wm8997_probe(struct platform_device *pdev)
    goto err_spk_irqs;
    }

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

    err_spk_irqs:
    --
    2.35.1


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