diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2020-04-21 21:41:36 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-04-21 21:41:36 +0200 |
| commit | e7b6b3ec01c1dddfa8418381f34a0dcbb0731eda (patch) | |
| tree | 0a24ee45fbc8abbb3999c658f4b4a2f03271d687 /sound/soc/codecs/wm8960.c | |
| parent | ALSA: usb-audio: Apply async workaround for Scarlett 2i4 2nd gen (diff) | |
| parent | ASoC: wm8960: Fix wrong clock after suspend & resume (diff) | |
| download | wireguard-linux-e7b6b3ec01c1dddfa8418381f34a0dcbb0731eda.tar.xz wireguard-linux-e7b6b3ec01c1dddfa8418381f34a0dcbb0731eda.zip | |
Merge tag 'asoc-fix-v5.7-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.7
Quite a lot of fixes here, a lot of driver specific ones but the biggest
one is the revert of changes to the startup and shutdown sequence for
DAIs that went in during the merge window - they broke some older x86
platforms and attempts to fix them didn't succeed so it's safer to just
roll them back and try to make sure those platforms are handled properly
in any future attempt.
The rockchip S/PDIF DT stuff was IIRC for validation issues.
Diffstat (limited to 'sound/soc/codecs/wm8960.c')
| -rw-r--r-- | sound/soc/codecs/wm8960.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 55112c1bba5e..6cf0f6612bda 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -860,8 +860,7 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream, wm8960->is_stream_in_use[tx] = true; - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON && - !wm8960->is_stream_in_use[!tx]) + if (!wm8960->is_stream_in_use[!tx]) return wm8960_configure_clocking(component); return 0; |