diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-10-27 08:26:32 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-10-27 08:26:32 +0200 |
| commit | f850a2b156448bd97c747f6206523886578850c7 (patch) | |
| tree | 74053930bead13f7a241fe4868c935f1dc358284 /sound/soc/codecs/wm8997.c | |
| parent | 50895a55bcfde8ac6f22a37c6bc8cff506b3c7c6 (diff) | |
| parent | e9441675edc1bb8dbfadacf68aafacca60d65a25 (diff) | |
| download | linux-stable-f850a2b156448bd97c747f6206523886578850c7.tar.gz linux-stable-f850a2b156448bd97c747f6206523886578850c7.tar.bz2 linux-stable-f850a2b156448bd97c747f6206523886578850c7.zip | |
Merge tag 'asoc-fix-v6.1-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.1
Quite a few fixes here, a lot driver specific, plus some new quirks.
There was a bit of a mess with the runtime PM handling due to some
confusion in the API there which resulted in a number of commits and
reverts but that should all be stable now.
Diffstat (limited to 'sound/soc/codecs/wm8997.c')
| -rw-r--r-- | sound/soc/codecs/wm8997.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c index 77136a521605..c0207e9a7d53 100644 --- a/sound/soc/codecs/wm8997.c +++ b/sound/soc/codecs/wm8997.c @@ -1161,6 +1161,9 @@ 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); @@ -1179,14 +1182,12 @@ 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: arizona_free_spk_irqs(arizona); err_jack_codec_dev: + pm_runtime_disable(&pdev->dev); arizona_jack_codec_dev_remove(&wm8997->core); return ret; |