Commit 2a405b36 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-6.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "There is a single change in ALSA core (for sequencer code for the
  module auto-loading in a wrong timing) while the all rest are various
  HD- and USB-audio fixes.

  Many of them are boring device-specific quirks, and should be safe to
  take"

* tag 'sound-6.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/realtek: Add support for ASUS Zenbook UM3406KA Laptops using CS35L41 HDA
  ALSA: hda/realtek: Add support for ASUS B5405 and B5605 Laptops using CS35L41 HDA
  ALSA: hda/realtek: Add support for ASUS B3405 and B3605 Laptops using CS35L41 HDA
  ALSA: hda/realtek: Add support for various ASUS Laptops using CS35L41 HDA
  ALSA: hda/realtek: Add support for ASUS ROG Strix G614 Laptops using CS35L41 HDA
  ALSA: hda/realtek: Add support for ASUS ROG Strix GA603 Laptops using CS35L41 HDA
  ALSA: hda/realtek: Add support for ASUS ROG Strix G814 Laptop using CS35L41 HDA
  ALSA: hda: intel: Add Dell ALC3271 to power_save denylist
  ALSA: hda/realtek: update ALC222 depop optimize
  ALSA: hda: realtek: fix incorrect IS_REACHABLE() usage
  ALSA: usx2y: validate nrpacks module parameter on probe
  ALSA: hda/realtek - add supported Mic Mute LED for Lenovo platform
  ALSA: seq: Avoid module auto-load handling at event delivery
  ALSA: hda: Fix speakers on ASUS EXPERTBOOK P5405CSA 1.0
  ALSA: hda/realtek: Fix Asus Z13 2025 audio
  ALSA: hda/realtek: Remove (revert) duplicate Ally X config
parents 00a7d398 8463d2ad

sound/core/seq/seq_clientmgr.c

+30 −16
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static struct snd_seq_client *clientptr(int clientid) 
	return clienttab[clientid];

}



struct snd_seq_client *snd_seq_client_use_ptr(int clientid)

static struct snd_seq_client *client_use_ptr(int clientid, bool load_module)

{

	unsigned long flags;

	struct snd_seq_client *client;
@@ -126,7 +126,7 @@ struct snd_seq_client *snd_seq_client_use_ptr(int clientid) 
	}

	spin_unlock_irqrestore(&clients_lock, flags);

#ifdef CONFIG_MODULES

	if (!in_interrupt()) {

	if (load_module) {

		static DECLARE_BITMAP(client_requested, SNDRV_SEQ_GLOBAL_CLIENTS);

		static DECLARE_BITMAP(card_requested, SNDRV_CARDS);
@@ -168,6 +168,20 @@ struct snd_seq_client *snd_seq_client_use_ptr(int clientid) 
	return client;

}



/* get snd_seq_client object for the given id quickly */

struct snd_seq_client *snd_seq_client_use_ptr(int clientid)

{

	return client_use_ptr(clientid, false);

}



/* get snd_seq_client object for the given id;

 * if not found, retry after loading the modules

 */

static struct snd_seq_client *client_load_and_use_ptr(int clientid)

{

	return client_use_ptr(clientid, IS_ENABLED(CONFIG_MODULES));

}



/* Take refcount and perform ioctl_mutex lock on the given client;

 * used only for OSS sequencer

 * Unlock via snd_seq_client_ioctl_unlock() below
@@ -176,7 +190,7 @@ bool snd_seq_client_ioctl_lock(int clientid) 
{

	struct snd_seq_client *client;



	client = snd_seq_client_use_ptr(clientid);

	client = client_load_and_use_ptr(clientid);

	if (!client)

		return false;

	mutex_lock(&client->ioctl_mutex);
@@ -1195,7 +1209,7 @@ static int snd_seq_ioctl_running_mode(struct snd_seq_client *client, void *arg) 
	int err = 0;



	/* requested client number */

	cptr = snd_seq_client_use_ptr(info->client);

	cptr = client_load_and_use_ptr(info->client);

	if (cptr == NULL)

		return -ENOENT;		/* don't change !!! */
@@ -1257,7 +1271,7 @@ static int snd_seq_ioctl_get_client_info(struct snd_seq_client *client, 
	struct snd_seq_client *cptr;



	/* requested client number */

	cptr = snd_seq_client_use_ptr(client_info->client);

	cptr = client_load_and_use_ptr(client_info->client);

	if (cptr == NULL)

		return -ENOENT;		/* don't change !!! */
@@ -1396,7 +1410,7 @@ static int snd_seq_ioctl_get_port_info(struct snd_seq_client *client, void *arg) 
	struct snd_seq_client *cptr;

	struct snd_seq_client_port *port;



	cptr = snd_seq_client_use_ptr(info->addr.client);

	cptr = client_load_and_use_ptr(info->addr.client);

	if (cptr == NULL)

		return -ENXIO;
@@ -1503,10 +1517,10 @@ static int snd_seq_ioctl_subscribe_port(struct snd_seq_client *client, 
	struct snd_seq_client *receiver = NULL, *sender = NULL;

	struct snd_seq_client_port *sport = NULL, *dport = NULL;



	receiver = snd_seq_client_use_ptr(subs->dest.client);

	receiver = client_load_and_use_ptr(subs->dest.client);

	if (!receiver)

		goto __end;

	sender = snd_seq_client_use_ptr(subs->sender.client);

	sender = client_load_and_use_ptr(subs->sender.client);

	if (!sender)

		goto __end;

	sport = snd_seq_port_use_ptr(sender, subs->sender.port);
@@ -1871,7 +1885,7 @@ static int snd_seq_ioctl_get_client_pool(struct snd_seq_client *client, 
	struct snd_seq_client_pool *info = arg;

	struct snd_seq_client *cptr;



	cptr = snd_seq_client_use_ptr(info->client);

	cptr = client_load_and_use_ptr(info->client);

	if (cptr == NULL)

		return -ENOENT;

	memset(info, 0, sizeof(*info));
@@ -1975,7 +1989,7 @@ static int snd_seq_ioctl_get_subscription(struct snd_seq_client *client, 
	struct snd_seq_client_port *sport = NULL;



	result = -EINVAL;

	sender = snd_seq_client_use_ptr(subs->sender.client);

	sender = client_load_and_use_ptr(subs->sender.client);

	if (!sender)

		goto __end;

	sport = snd_seq_port_use_ptr(sender, subs->sender.port);
@@ -2006,7 +2020,7 @@ static int snd_seq_ioctl_query_subs(struct snd_seq_client *client, void *arg) 
	struct list_head *p;

	int i;



	cptr = snd_seq_client_use_ptr(subs->root.client);

	cptr = client_load_and_use_ptr(subs->root.client);

	if (!cptr)

		goto __end;

	port = snd_seq_port_use_ptr(cptr, subs->root.port);
@@ -2073,7 +2087,7 @@ static int snd_seq_ioctl_query_next_client(struct snd_seq_client *client, 
	if (info->client < 0)

		info->client = 0;

	for (; info->client < SNDRV_SEQ_MAX_CLIENTS; info->client++) {

		cptr = snd_seq_client_use_ptr(info->client);

		cptr = client_load_and_use_ptr(info->client);

		if (cptr)

			break; /* found */

	}
@@ -2096,7 +2110,7 @@ static int snd_seq_ioctl_query_next_port(struct snd_seq_client *client, 
	struct snd_seq_client *cptr;

	struct snd_seq_client_port *port = NULL;



	cptr = snd_seq_client_use_ptr(info->addr.client);

	cptr = client_load_and_use_ptr(info->addr.client);

	if (cptr == NULL)

		return -ENXIO;
@@ -2193,7 +2207,7 @@ static int snd_seq_ioctl_client_ump_info(struct snd_seq_client *caller, 
		size = sizeof(struct snd_ump_endpoint_info);

	else

		size = sizeof(struct snd_ump_block_info);

	cptr = snd_seq_client_use_ptr(client);

	cptr = client_load_and_use_ptr(client);

	if (!cptr)

		return -ENOENT;
@@ -2475,7 +2489,7 @@ int snd_seq_kernel_client_enqueue(int client, struct snd_seq_event *ev, 
	if (check_event_type_and_length(ev))

		return -EINVAL;



	cptr = snd_seq_client_use_ptr(client);

	cptr = client_load_and_use_ptr(client);

	if (cptr == NULL)

		return -EINVAL;
@@ -2707,7 +2721,7 @@ void snd_seq_info_clients_read(struct snd_info_entry *entry, 


	/* list the client table */

	for (c = 0; c < SNDRV_SEQ_MAX_CLIENTS; c++) {

		client = snd_seq_client_use_ptr(c);

		client = client_load_and_use_ptr(c);

		if (client == NULL)

			continue;

		if (client->type == NO_CLIENT) {

sound/pci/hda/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ comment "Set to Y if you want auto-loading the side codec driver" 


config SND_HDA_CODEC_REALTEK

	tristate "Build Realtek HD-audio codec support"

	depends on INPUT

	select SND_HDA_GENERIC

	select SND_HDA_GENERIC_LEDS

	select SND_HDA_SCODEC_COMPONENT

sound/pci/hda/hda_intel.c

+2 −0
Original line number Diff line number Diff line
@@ -2232,6 +2232,8 @@ static const struct snd_pci_quirk power_save_denylist[] = { 
	SND_PCI_QUIRK(0x1631, 0xe017, "Packard Bell NEC IMEDIA 5204", 0),

	/* KONTRON SinglePC may cause a stall at runtime resume */

	SND_PCI_QUIRK(0x1734, 0x1232, "KONTRON SinglePC", 0),

	/* Dell ALC3271 */

	SND_PCI_QUIRK(0x1028, 0x0962, "Dell ALC3271", 0),

	{}

};

sound/pci/hda/patch_realtek.c

+115 −13
Original line number Diff line number Diff line
@@ -3843,6 +3843,79 @@ static void alc225_shutup(struct hda_codec *codec) 
	}

}



static void alc222_init(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;

	hda_nid_t hp_pin = alc_get_hp_pin(spec);

	bool hp1_pin_sense, hp2_pin_sense;



	if (!hp_pin)

		return;



	msleep(30);



	hp1_pin_sense = snd_hda_jack_detect(codec, hp_pin);

	hp2_pin_sense = snd_hda_jack_detect(codec, 0x14);



	if (hp1_pin_sense || hp2_pin_sense) {

		msleep(2);



		if (hp1_pin_sense)

			snd_hda_codec_write(codec, hp_pin, 0,

				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);

		if (hp2_pin_sense)

			snd_hda_codec_write(codec, 0x14, 0,

				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);

		msleep(75);



		if (hp1_pin_sense)

			snd_hda_codec_write(codec, hp_pin, 0,

				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);

		if (hp2_pin_sense)

			snd_hda_codec_write(codec, 0x14, 0,

				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);



		msleep(75);

	}

}



static void alc222_shutup(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;

	hda_nid_t hp_pin = alc_get_hp_pin(spec);

	bool hp1_pin_sense, hp2_pin_sense;



	if (!hp_pin)

		hp_pin = 0x21;



	hp1_pin_sense = snd_hda_jack_detect(codec, hp_pin);

	hp2_pin_sense = snd_hda_jack_detect(codec, 0x14);



	if (hp1_pin_sense || hp2_pin_sense) {

		msleep(2);



		if (hp1_pin_sense)

			snd_hda_codec_write(codec, hp_pin, 0,

				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);

		if (hp2_pin_sense)

			snd_hda_codec_write(codec, 0x14, 0,

				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);



		msleep(75);



		if (hp1_pin_sense)

			snd_hda_codec_write(codec, hp_pin, 0,

				    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);

		if (hp2_pin_sense)

			snd_hda_codec_write(codec, 0x14, 0,

				    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);



		msleep(75);

	}

	alc_auto_setup_eapd(codec, false);

	alc_shutup_pins(codec);

}



static void alc_default_init(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;
@@ -4927,7 +5000,6 @@ static void alc298_fixup_samsung_amp_v2_4_amps(struct hda_codec *codec, 
		alc298_samsung_v2_init_amps(codec, 4);

}



#if IS_REACHABLE(CONFIG_INPUT)

static void gpio2_mic_hotkey_event(struct hda_codec *codec,

				   struct hda_jack_callback *event)

{
@@ -5036,10 +5108,6 @@ static void alc233_fixup_lenovo_line2_mic_hotkey(struct hda_codec *codec, 
		spec->kb_dev = NULL;

	}

}

#else /* INPUT */

#define alc280_fixup_hp_gpio2_mic_hotkey	NULL

#define alc233_fixup_lenovo_line2_mic_hotkey	NULL

#endif /* INPUT */



static void alc269_fixup_hp_line1_mic1_led(struct hda_codec *codec,

				const struct hda_fixup *fix, int action)
@@ -5053,6 +5121,16 @@ static void alc269_fixup_hp_line1_mic1_led(struct hda_codec *codec, 
	}

}



static void alc233_fixup_lenovo_low_en_micmute_led(struct hda_codec *codec,

				const struct hda_fixup *fix, int action)

{

	struct alc_spec *spec = codec->spec;



	if (action == HDA_FIXUP_ACT_PRE_PROBE)

		spec->micmute_led_polarity = 1;

	alc233_fixup_lenovo_line2_mic_hotkey(codec, fix, action);

}



static void alc_hp_mute_disable(struct hda_codec *codec, unsigned int delay)

{

	if (delay <= 0)
@@ -7621,6 +7699,7 @@ enum { 
	ALC275_FIXUP_DELL_XPS,

	ALC293_FIXUP_LENOVO_SPK_NOISE,

	ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY,

	ALC233_FIXUP_LENOVO_L2MH_LOW_ENLED,

	ALC255_FIXUP_DELL_SPK_NOISE,

	ALC225_FIXUP_DISABLE_MIC_VREF,

	ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,
@@ -7690,7 +7769,6 @@ enum { 
	ALC285_FIXUP_THINKPAD_X1_GEN7,

	ALC285_FIXUP_THINKPAD_HEADSET_JACK,

	ALC294_FIXUP_ASUS_ALLY,

	ALC294_FIXUP_ASUS_ALLY_X,

	ALC294_FIXUP_ASUS_ALLY_PINS,

	ALC294_FIXUP_ASUS_ALLY_VERBS,

	ALC294_FIXUP_ASUS_ALLY_SPEAKER,
@@ -8616,6 +8694,10 @@ static const struct hda_fixup alc269_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = alc233_fixup_lenovo_line2_mic_hotkey,

	},

	[ALC233_FIXUP_LENOVO_L2MH_LOW_ENLED] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc233_fixup_lenovo_low_en_micmute_led,

	},

	[ALC233_FIXUP_INTEL_NUC8_DMIC] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_inv_dmic,
@@ -9138,12 +9220,6 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC294_FIXUP_ASUS_ALLY_PINS

	},

	[ALC294_FIXUP_ASUS_ALLY_X] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = tas2781_fixup_i2c,

		.chained = true,

		.chain_id = ALC294_FIXUP_ASUS_ALLY_PINS

	},

	[ALC294_FIXUP_ASUS_ALLY_PINS] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {
@@ -10600,7 +10676,9 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8e1a, "HP ZBook Firefly 14 G12A", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),

	SND_PCI_QUIRK(0x1043, 0x1054, "ASUS G614FH/FM/FP", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x1043, 0x1074, "ASUS G614PH/PM/PP", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x10a1, "ASUS UX391UA", ALC294_FIXUP_ASUS_SPK),

	SND_PCI_QUIRK(0x1043, 0x10a4, "ASUS TP3407SA", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x1043, 0x10c0, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),
@@ -10608,15 +10686,18 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x10d3, "ASUS K6500ZC", ALC294_FIXUP_ASUS_SPK),

	SND_PCI_QUIRK(0x1043, 0x1154, "ASUS TP3607SH", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x1043, 0x115d, "Asus 1015E", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x1043, 0x1194, "ASUS UM3406KA", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x11c0, "ASUS X556UR", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1204, "ASUS Strix G615JHR_JMR_JPR", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x1043, 0x1214, "ASUS Strix G615LH_LM_LP", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x1043, 0x125e, "ASUS Q524UQK", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1271, "ASUS X430UN", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1290, "ASUS X441SA", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1294, "ASUS B3405CVA", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x12a0, "ASUS X441UV", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x12a3, "Asus N7691ZM", ALC269_FIXUP_ASUS_N7601ZM),

	SND_PCI_QUIRK(0x1043, 0x12af, "ASUS UX582ZS", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x12b4, "ASUS B3405CCA / P3405CCA", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x12e0, "ASUS X541SA", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x12f0, "ASUS X541UV", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x1313, "Asus K42JZ", ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE),
@@ -10645,7 +10726,6 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x1740, "ASUS UX430UA", ALC295_FIXUP_ASUS_DACS),

	SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_DUAL_SPK),

	SND_PCI_QUIRK(0x1043, 0x17f3, "ROG Ally NR2301L/X", ALC294_FIXUP_ASUS_ALLY),

	SND_PCI_QUIRK(0x1043, 0x1eb3, "ROG Ally X RC72LA", ALC294_FIXUP_ASUS_ALLY_X),

	SND_PCI_QUIRK(0x1043, 0x1863, "ASUS UX6404VI/VV", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS),

	SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC),
@@ -10699,14 +10779,28 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x1f12, "ASUS UM5302", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x1f1f, "ASUS H7604JI/JV/J3D", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x1f62, "ASUS UX7602ZM", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x1f63, "ASUS P5405CSA", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x1f92, "ASUS ROG Flow X16", ALC289_FIXUP_ASUS_GA401),

	SND_PCI_QUIRK(0x1043, 0x1fb3, "ASUS ROG Flow Z13 GZ302EA", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x3011, "ASUS B5605CVA", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2),

	SND_PCI_QUIRK(0x1043, 0x3061, "ASUS B3405CCA", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x3071, "ASUS B5405CCA", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x30c1, "ASUS B3605CCA / P3605CCA", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x30d1, "ASUS B5405CCA", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x30e1, "ASUS B5605CCA", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x31d0, "ASUS Zen AIO 27 Z272SD_A272SD", ALC274_FIXUP_ASUS_ZEN_AIO_27),

	SND_PCI_QUIRK(0x1043, 0x31e1, "ASUS B5605CCA", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x31f1, "ASUS B3605CCA", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x3a20, "ASUS G614JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),

	SND_PCI_QUIRK(0x1043, 0x3a30, "ASUS G814JVR/JIR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),

	SND_PCI_QUIRK(0x1043, 0x3a40, "ASUS G814JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),

	SND_PCI_QUIRK(0x1043, 0x3a50, "ASUS G834JYR/JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),

	SND_PCI_QUIRK(0x1043, 0x3a60, "ASUS G634JYR/JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),

	SND_PCI_QUIRK(0x1043, 0x3d78, "ASUS GA603KH", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x3d88, "ASUS GA603KM", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x3e00, "ASUS G814FH/FM/FP", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x3e20, "ASUS G814PH/PM/PP", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x3e30, "ASUS TP3607SA", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x1043, 0x3ee0, "ASUS Strix G815_JHR_JMR_JPR", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x1043, 0x3ef0, "ASUS Strix G635LR_LW_LX", ALC287_FIXUP_TAS2781_I2C),
@@ -10714,6 +10808,8 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x3f10, "ASUS Strix G835LR_LW_LX", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x1043, 0x3f20, "ASUS Strix G615LR_LW", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x1043, 0x3f30, "ASUS Strix G815LR_LW", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x1043, 0x3fd0, "ASUS B3605CVA", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x3ff0, "ASUS B5405CVA", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x1043, 0x8398, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC),
@@ -10912,6 +11008,9 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x3178, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x17aa, 0x31af, "ThinkCentre Station", ALC623_FIXUP_LENOVO_THINKSTATION_P340),

	SND_PCI_QUIRK(0x17aa, 0x334b, "Lenovo ThinkCentre M70 Gen5", ALC283_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x17aa, 0x3384, "ThinkCentre M90a PRO", ALC233_FIXUP_LENOVO_L2MH_LOW_ENLED),

	SND_PCI_QUIRK(0x17aa, 0x3386, "ThinkCentre M90a Gen6", ALC233_FIXUP_LENOVO_L2MH_LOW_ENLED),

	SND_PCI_QUIRK(0x17aa, 0x3387, "ThinkCentre M70a Gen6", ALC233_FIXUP_LENOVO_L2MH_LOW_ENLED),

	SND_PCI_QUIRK(0x17aa, 0x3801, "Lenovo Yoga9 14IAP7", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),

	HDA_CODEC_QUIRK(0x17aa, 0x3802, "DuetITL 2021", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),

	SND_PCI_QUIRK(0x17aa, 0x3802, "Lenovo Yoga Pro 9 14IRP8", ALC287_FIXUP_TAS2781_I2C),
@@ -11900,8 +11999,11 @@ static int patch_alc269(struct hda_codec *codec) 
		spec->codec_variant = ALC269_TYPE_ALC300;

		spec->gen.mixer_nid = 0; /* no loopback on ALC300 */

		break;

	case 0x10ec0222:

	case 0x10ec0623:

		spec->codec_variant = ALC269_TYPE_ALC623;

		spec->shutup = alc222_shutup;

		spec->init_hook = alc222_init;

		break;

	case 0x10ec0700:

	case 0x10ec0701:

sound/usb/usx2y/usbusx2y.c

+11 −0
Original line number Diff line number Diff line
@@ -151,6 +151,12 @@ static int snd_usx2y_card_used[SNDRV_CARDS]; 
static void snd_usx2y_card_private_free(struct snd_card *card);

static void usx2y_unlinkseq(struct snd_usx2y_async_seq *s);



#ifdef USX2Y_NRPACKS_VARIABLE

int nrpacks = USX2Y_NRPACKS; /* number of packets per urb */

module_param(nrpacks, int, 0444);

MODULE_PARM_DESC(nrpacks, "Number of packets per URB.");

#endif



/*

 * pipe 4 is used for switching the lamps, setting samplerate, volumes ....

 */
@@ -432,6 +438,11 @@ static int snd_usx2y_probe(struct usb_interface *intf, 
	struct snd_card *card;

	int err;



#ifdef USX2Y_NRPACKS_VARIABLE

	if (nrpacks < 0 || nrpacks > USX2Y_NRPACKS_MAX)

		return -EINVAL;

#endif



	if (le16_to_cpu(device->descriptor.idVendor) != 0x1604 ||

	    (le16_to_cpu(device->descriptor.idProduct) != USB_ID_US122 &&

	     le16_to_cpu(device->descriptor.idProduct) != USB_ID_US224 &&