diff options
author | Ingo Molnar <mingo@kernel.org> | 2024-02-27 10:09:49 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2024-02-27 10:09:49 +0100 |
commit | 9b9c280b9af2aa851d83e7d0b79f36a3d869d745 (patch) | |
tree | b61cf8566669d9615234e87696a833ee487e2655 /sound/soc/intel/boards/bytcht_es8316.c | |
parent | x86/apic: Build the x86 topology enumeration functions on UP APIC builds too (diff) | |
parent | x86/bugs: Use fixed addressing for VERW operand (diff) | |
download | linux-9b9c280b9af2aa851d83e7d0b79f36a3d869d745.tar.gz linux-9b9c280b9af2aa851d83e7d0b79f36a3d869d745.tar.bz2 linux-9b9c280b9af2aa851d83e7d0b79f36a3d869d745.zip |
Merge branch 'x86/urgent' into x86/apic, to resolve conflicts
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/intel.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'sound/soc/intel/boards/bytcht_es8316.c')
-rw-r--r-- | sound/soc/intel/boards/bytcht_es8316.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 1564a88a885e..2fcec2e02bb5 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -546,7 +546,8 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) /* fix index of codec dai */ for (i = 0; i < ARRAY_SIZE(byt_cht_es8316_dais); i++) { - if (!strcmp(byt_cht_es8316_dais[i].codecs->name, + if (byt_cht_es8316_dais[i].codecs->name && + !strcmp(byt_cht_es8316_dais[i].codecs->name, "i2c-ESSX8316:00")) { dai_index = i; break; |