Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27c09443 authored by Zhang Qilong's avatar Zhang Qilong Committed by Greg Kroah-Hartman
Browse files

ASoC: pcm512x: Fix PM disable depth imbalance in pcm512x_probe 



[ Upstream commit 97b801be6f8e53676b9f2b105f54e35c745c1b22 ]

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 going to
err_pm instead of err_clk.

Fixes:f086ba9d ("ASoC: pcm512x: Support mastering BCLK/LRCLK using the PLL")

Signed-off-by: default avatarZhang Qilong <zhangqilong3@huawei.com>
Link: https://lore.kernel.org/r/20220928160402.126140-1-zhangqilong3@huawei.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 981024ab

sound/soc/codecs/pcm512x.c

+4 −4
Original line number Diff line number Diff line
@@ -1598,7 +1598,7 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap) 
			if (val > 6) {

				dev_err(dev, "Invalid pll-in\n");

				ret = -EINVAL;

				goto err_clk;

				goto err_pm;

			}

			pcm512x->pll_in = val;

		}
@@ -1607,7 +1607,7 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap) 
			if (val > 6) {

				dev_err(dev, "Invalid pll-out\n");

				ret = -EINVAL;

				goto err_clk;

				goto err_pm;

			}

			pcm512x->pll_out = val;

		}
@@ -1616,12 +1616,12 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap) 
			dev_err(dev,

				"Error: both pll-in and pll-out, or none\n");

			ret = -EINVAL;

			goto err_clk;

			goto err_pm;

		}

		if (pcm512x->pll_in && pcm512x->pll_in == pcm512x->pll_out) {

			dev_err(dev, "Error: pll-in == pll-out\n");

			ret = -EINVAL;

			goto err_clk;

			goto err_pm;

		}

	}

#endif