diff options
author | Takashi Iwai <tiwai@suse.de> | 2021-09-21 18:42:14 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2021-09-21 18:42:14 +0200 |
commit | 77ff9e7be0d420bd0555ef51612e8ce241f3e78f (patch) | |
tree | 4848c1783c895dddc65aa763b28af648421c8cfa /sound/soc/intel | |
parent | ALSA: hda/cs8409: Setup Dolphin Headset Mic as Phantom Jack (diff) | |
parent | ASoC: SOF: trace: Omit error print when waking up trace sleepers (diff) | |
download | linux-77ff9e7be0d420bd0555ef51612e8ce241f3e78f.tar.xz linux-77ff9e7be0d420bd0555ef51612e8ce241f3e78f.zip |
Merge tag 'asoc-fix-v5.15-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.15
A crop of mostly device specific fixes that have been applied since
the merge window, nothing particularly standout here.
Diffstat (limited to 'sound/soc/intel')
-rw-r--r-- | sound/soc/intel/boards/sof_sdw.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 6602eda89e8e..6b06248a9327 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -929,6 +929,11 @@ static int create_sdw_dailink(struct snd_soc_card *card, cpus + *cpu_id, cpu_dai_num, codecs, codec_num, NULL, &sdw_ops); + /* + * SoundWire DAILINKs use 'stream' functions and Bank Switch operations + * based on wait_for_completion(), tag them as 'nonatomic'. + */ + dai_links[*be_index].nonatomic = true; ret = set_codec_init_func(card, link, dai_links + (*be_index)++, playback, group_id); |