diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2022-03-10 14:31:27 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-03-10 14:31:27 +0100 |
| commit | 09354ebe10b7c8447559aa1fda2cb3a5ca6034e1 (patch) | |
| tree | 0976709067295ca5e34bf01f6f450d6be13ddf29 /sound/soc/intel | |
| parent | ALSA: hda/realtek: Add quirk for Clevo NP50PNJ (diff) | |
| parent | ASoC: cs35l41: Fix DSP mbox start command and global enable order (diff) | |
| download | linux-dev-09354ebe10b7c8447559aa1fda2cb3a5ca6034e1.tar.xz linux-dev-09354ebe10b7c8447559aa1fda2cb3a5ca6034e1.zip | |
Merge tag 'asoc-fix-v5.17-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Potential fixes for v5.17
Rather more fixes here than I'm comfortable with, we've had several
vendors noticing issues late in the release cycle all of which are valid
and reasonable fixes but it adds up to a much larger change set than I'd
like. Several of the AMD fixes look like cleanups from the subject
lines but are actually fixing user visible problems as well.
If you were to merge this for 5.18 rather than 5.17 it wouldn't be the
end of the world, stable will probably backport everything anyway.
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/common/soc-acpi-intel-byt-match.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/common/soc-acpi-intel-byt-match.c b/sound/soc/intel/common/soc-acpi-intel-byt-match.c index 142000991813..c532529a3856 100644 --- a/sound/soc/intel/common/soc-acpi-intel-byt-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-byt-match.c @@ -127,7 +127,7 @@ static const struct snd_soc_acpi_codecs rt5640_comp_ids = { static const struct snd_soc_acpi_codecs wm5102_comp_ids = { .num_codecs = 2, - .codecs = { "WM510204", "WM510205"}, + .codecs = { "10WM5102", "WM510204", "WM510205"}, }; static const struct snd_soc_acpi_codecs da7213_comp_ids = { |