Commit 04f9196b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.16-rc5' of... 

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.
parents 19c4096c a609bd74

sound/soc/amd/yc/acp6x-mach.c

+7 −0
Original line number Diff line number Diff line
@@ -416,6 +416,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "M6500RC"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "M6501RM"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

sound/soc/intel/avs/pcm.c

+3 −1
Original line number Diff line number Diff line
@@ -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) {