diff options
| author | Takashi Iwai <tiwai@suse.de> | 2025-07-10 12:59:31 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2025-07-10 12:59:31 +0300 |
| commit | 04f9196ba981c9f23fa0c3c30bb290fb81848cec (patch) | |
| tree | 17e92c022274cfbb2f8580f3d9ff623b03e513f3 | |
| parent | 19c4096ccdd809c6213e2e62b0d4f57c880138cd (diff) | |
| parent | a609bd74b8680dba62c44f7e6d00d381ddb2d3c0 (diff) | |
| download | linux-04f9196ba981c9f23fa0c3c30bb290fb81848cec.tar.xz | |
Merge tag 'asoc-fix-v6.16-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.16
Two patches here, one quirk for an AMD system and a fix for an issue on
remove of the AVS driver.
| -rw-r--r-- | sound/soc/amd/yc/acp6x-mach.c | 7 | ||||
| -rw-r--r-- | sound/soc/intel/avs/pcm.c | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c index 97e340140d0c..61fcc30c3353 100644 --- a/sound/soc/amd/yc/acp6x-mach.c +++ b/sound/soc/amd/yc/acp6x-mach.c @@ -420,6 +420,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { .driver_data = &acp6x_card, .matches = { DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "M6501RM"), + } + }, + { + .driver_data = &acp6x_card, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_PRODUCT_NAME, "E1404FA"), } }, diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c index ccf90428126d..0efe490024b0 100644 --- a/sound/soc/intel/avs/pcm.c +++ b/sound/soc/intel/avs/pcm.c @@ -1570,11 +1570,13 @@ static void avs_component_hda_unregister_dais(struct snd_soc_component *componen { struct snd_soc_acpi_mach *mach; struct snd_soc_dai *dai, *save; + struct avs_mach_pdata *pdata; struct hda_codec *codec; char name[32]; mach = dev_get_platdata(component->card->dev); - codec = mach->pdata; + pdata = mach->pdata; + codec = pdata->codec; snprintf(name, sizeof(name), "%s-cpu", dev_name(&codec->core.dev)); for_each_component_dais_safe(component, dai, save) { |