diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-09-11 18:26:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-09-11 18:26:04 +0200 |
| commit | 8949b6660c3c7947a9b696c97eb85a32abe4a2d7 (patch) | |
| tree | d4593b3d4624b0fbceb22a38e26465bca1711d5a /include | |
| parent | fc19d559b0d31b5b831fd468b10d7dadafc0d0ec (diff) | |
| parent | 1a5ce48fd667128e369fdc7fb87e21539aed21b5 (diff) | |
| download | lwn-8949b6660c3c7947a9b696c97eb85a32abe4a2d7.tar.gz lwn-8949b6660c3c7947a9b696c97eb85a32abe4a2d7.zip | |
Merge tag 'asoc-fix-v5.9-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.9
Most of this is various driver specific fixes, none of which are
terribly exciting in themselves, plus one core fix adding and using a
new DAI lookup function to deal with a lockdep warning.
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 5e3919ffb00c..fc4fcac72cf7 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1193,6 +1193,8 @@ struct snd_soc_pcm_runtime { ((i) < (rtd)->num_cpus + (rtd)->num_codecs) && \ ((dai) = (rtd)->dais[i]); \ (i)++) +#define for_each_rtd_dais_rollback(rtd, i, dai) \ + for (; (--(i) >= 0) && ((dai) = (rtd)->dais[i]);) void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd); @@ -1361,6 +1363,8 @@ void snd_soc_unregister_dai(struct snd_soc_dai *dai); struct snd_soc_dai *snd_soc_find_dai( const struct snd_soc_dai_link_component *dlc); +struct snd_soc_dai *snd_soc_find_dai_with_mutex( + const struct snd_soc_dai_link_component *dlc); #include <sound/soc-dai.h> |