microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

ASoC: pcm512x: Fix PM disable depth imbalance in pcm512x_probe 

[ Upstream commit 97b801be6f ]

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:f086ba9d5389c ("ASoC: pcm512x: Support mastering BCLK/LRCLK using the PLL")

Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
Link: https://lore.kernel.org/r/20220928160402.126140-1-zhangqilong3@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Zhang Qilong 2022-09-29 00:04:02 +08:00 коммит произвёл Greg Kroah-Hartman
Родитель 8876793e56
Коммит 09fe3b1392
1 изменённых файлов: 4 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
sound/soc/codecs/pcm512x.c
Просмотреть файл

@ -1635,7 +1635,7 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap)
if (val > 6) { if (val > 6) {
dev_err(dev, "Invalid pll-in\n"); dev_err(dev, "Invalid pll-in\n");
ret = -EINVAL; ret = -EINVAL;
goto err_clk; goto err_pm;
} }
pcm512x->pll_in = val; pcm512x->pll_in = val;
} }
@ -1644,7 +1644,7 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap)
if (val > 6) { if (val > 6) {
dev_err(dev, "Invalid pll-out\n"); dev_err(dev, "Invalid pll-out\n");
ret = -EINVAL; ret = -EINVAL;
goto err_clk; goto err_pm;
} }
pcm512x->pll_out = val; pcm512x->pll_out = val;
} }
@ -1653,12 +1653,12 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap)
dev_err(dev, dev_err(dev,
"Error: both pll-in and pll-out, or none\n"); "Error: both pll-in and pll-out, or none\n");
ret = -EINVAL; ret = -EINVAL;
goto err_clk; goto err_pm;
} }
if (pcm512x->pll_in && pcm512x->pll_in == pcm512x->pll_out) { if (pcm512x->pll_in && pcm512x->pll_in == pcm512x->pll_out) {
dev_err(dev, "Error: pll-in == pll-out\n"); dev_err(dev, "Error: pll-in == pll-out\n");
ret = -EINVAL; ret = -EINVAL;
goto err_clk; goto err_pm;
} }
} }
#endif #endif