diff options
| author | Takashi Iwai <tiwai@suse.de> | 2026-01-08 16:07:33 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2026-01-08 16:07:33 +0300 |
| commit | 8bf65ec41901ff6b2958576ba4896589d89f6404 (patch) | |
| tree | a0a543bf4476dd8d436d46f81303887c25bf1429 /include | |
| parent | b47ce586300b3c2b6650f4c7ac5c0f59c6bf6f4b (diff) | |
| parent | b7e26c8bdae70832d7c4b31ec2995b1812a60169 (diff) | |
| download | linux-8bf65ec41901ff6b2958576ba4896589d89f6404.tar.xz | |
Merge branch 'for-linus' into for-next
Pull 6.19-devel branch.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/pcm.h | 2 | ||||
| -rw-r--r-- | include/sound/soc-acpi.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 58fd6e84f961..a7860c047503 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -1402,7 +1402,7 @@ int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream, struct vm_area_s #define snd_pcm_lib_mmap_iomem NULL #endif -void snd_pcm_runtime_buffer_set_silence(struct snd_pcm_runtime *runtime); +int snd_pcm_runtime_buffer_set_silence(struct snd_pcm_runtime *runtime); /** * snd_pcm_limit_isa_dma_size - Get the max size fitting with ISA DMA transfer diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h index 90d73b9bddab..0519afd7217f 100644 --- a/include/sound/soc-acpi.h +++ b/include/sound/soc-acpi.h @@ -203,6 +203,8 @@ struct snd_soc_acpi_link_adr { * @mach: the pointer of the machine driver * @prefix: the prefix of the topology file name. Typically, it is the path. * @tplg_files: the pointer of the array of the topology file names. + * @best_effort: ignore non supported links and try to build the card in best effort + * with supported links */ /* Descriptor for SST ASoC machine driver */ struct snd_soc_acpi_mach { @@ -224,7 +226,8 @@ struct snd_soc_acpi_mach { const u32 tplg_quirk_mask; int (*get_function_tplg_files)(struct snd_soc_card *card, const struct snd_soc_acpi_mach *mach, - const char *prefix, const char ***tplg_files); + const char *prefix, const char ***tplg_files, + bool best_effort); }; #define SND_SOC_ACPI_MAX_CODECS 3 |