diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-10-19 14:51:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-10-19 14:51:12 +0200 |
| commit | 87543ce5030a17ff5056668d7e6c433168c63bb5 (patch) | |
| tree | bf0ed8d7cb63986bd2ca59107cb8729f12b1d38a /include/sound | |
| parent | 2b17b489e47a956c8e93c8f1bcabb0343c851d90 (diff) | |
| parent | 8e13caa2150b5a1287a1900952d3d7e04363f921 (diff) | |
Merge branch 'for-linus' into for-next
For applying HD-audio EPROBE_DEFER series cleanly.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dapm.h | 1 | ||||
| -rw-r--r-- | include/sound/soc.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index d2faec9a323e..433543eb82b9 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -469,6 +469,7 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card); int snd_soc_dapm_update_dai(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai); +int snd_soc_dapm_widget_name_cmp(struct snd_soc_dapm_widget *widget, const char *s); /* dapm path setup */ int snd_soc_dapm_new_widgets(struct snd_soc_card *card); diff --git a/include/sound/soc.h b/include/sound/soc.h index fa2337a3cf4c..37f9d3fe302a 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1126,6 +1126,8 @@ struct snd_soc_pcm_runtime { unsigned int pop_wait:1; unsigned int fe_compr:1; /* for Dynamic PCM */ + bool initialized; + int num_components; struct snd_soc_component *components[]; /* CPU/Codec/Platform */ }; |