diff options
| author | Mark Brown <broonie@kernel.org> | 2026-02-10 19:23:02 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-02-10 19:23:02 +0000 |
| commit | f14c94d21f3ffcd6652217c2c74a26b6ba9ad741 (patch) | |
| tree | a30641aae5a0e4c8862c526b4169d5a3bbe03d7b /sound/soc/amd | |
| parent | 5578da7d957fbaf91f6c39ba2363c2d2e4273183 (diff) | |
| parent | 05f7e89ab9731565d8a62e3b5d1ec206485eeb0b (diff) | |
| download | lwn-f14c94d21f3ffcd6652217c2c74a26b6ba9ad741.tar.gz lwn-f14c94d21f3ffcd6652217c2c74a26b6ba9ad741.zip | |
ASoC: Merge up release
We need to fix some commits that went into the final release.
Diffstat (limited to 'sound/soc/amd')
| -rw-r--r-- | sound/soc/amd/renoir/acp3x-pdm-dma.c | 2 | ||||
| -rw-r--r-- | sound/soc/amd/yc/acp6x-mach.c | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sound/soc/amd/renoir/acp3x-pdm-dma.c b/sound/soc/amd/renoir/acp3x-pdm-dma.c index 95ac8c680037..a560d06097d5 100644 --- a/sound/soc/amd/renoir/acp3x-pdm-dma.c +++ b/sound/soc/amd/renoir/acp3x-pdm-dma.c @@ -301,9 +301,11 @@ static int acp_pdm_dma_close(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct pdm_dev_data *adata = dev_get_drvdata(component->dev); + struct pdm_stream_instance *rtd = substream->runtime->private_data; disable_pdm_interrupts(adata->acp_base); adata->capture_stream = NULL; + kfree(rtd); return 0; } diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c index c18da0915baa..67f2fee19398 100644 --- a/sound/soc/amd/yc/acp6x-mach.c +++ b/sound/soc/amd/yc/acp6x-mach.c @@ -643,6 +643,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { { .driver_data = &acp6x_card, .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "HP"), + DMI_MATCH(DMI_BOARD_NAME, "8EE4"), + } + }, + { + .driver_data = &acp6x_card, + .matches = { DMI_MATCH(DMI_BOARD_VENDOR, "MECHREVO"), DMI_MATCH(DMI_BOARD_NAME, "MRID6"), } |