Commit 430c89fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes. All changes are device-specific and
  trivial, mostly HD-audio and USB-audio quirks and fixups"

* tag 'sound-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/realtek: Add quirk for HP ProBook 450 G8
  ALSA: usb-audio: fix uac2 clock source at terminal parser
  ALSA: hda/realtek: add quirk for HP pavilion aero laptop 13z-be200
  ALSA: hda/cirrus fix cs420x MacPro 6,1 inverted jack detection
  ALSA: usb-audio: Add DSD quirk for LEAK Stereo 230
  ALSA: au88x0: Fix incorrect error handling for PCI config reads
parents a10d15a0 d041e5e7

sound/hda/codecs/cirrus/cs420x.c

+1 −0
Original line number Diff line number Diff line
@@ -585,6 +585,7 @@ static const struct hda_quirk cs4208_mac_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x106b, 0x6c00, "MacMini 7,1", CS4208_MACMINI),

	SND_PCI_QUIRK(0x106b, 0x7100, "MacBookAir 6,1", CS4208_MBA6),

	SND_PCI_QUIRK(0x106b, 0x7200, "MacBookAir 6,2", CS4208_MBA6),

	SND_PCI_QUIRK(0x106b, 0x7800, "MacPro 6,1", CS4208_MACMINI),

	SND_PCI_QUIRK(0x106b, 0x7b00, "MacBookPro 12,1", CS4208_MBP11),

	{} /* terminator */

};

sound/hda/codecs/realtek/alc269.c

+2 −0
Original line number Diff line number Diff line
@@ -6525,6 +6525,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8a4f, "HP Victus 15-fa0xxx (MB 8A4F)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),

	SND_PCI_QUIRK(0x103c, 0x8a6e, "HP EDNA 360", ALC287_FIXUP_CS35L41_I2C_4),

	SND_PCI_QUIRK(0x103c, 0x8a74, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8a75, "HP ProBook 450 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8a78, "HP Dev One", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x103c, 0x8aa0, "HP ProBook 440 G9 (MB 8A9E)", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8aa3, "HP ProBook 450 G9 (MB 8AA1)", ALC236_FIXUP_HP_GPIO_LED),
@@ -6572,6 +6573,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8bc8, "HP Victus 15-fa1xxx", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),

	SND_PCI_QUIRK(0x103c, 0x8bcd, "HP Omen 16-xd0xxx", ALC245_FIXUP_HP_MUTE_LED_V1_COEFBIT),

	SND_PCI_QUIRK(0x103c, 0x8bd4, "HP Victus 16-s0xxx (MB 8BD4)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),

	SND_PCI_QUIRK(0x103c, 0x8bd6, "HP Pavilion Aero Laptop 13z-be200", ALC287_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8bdd, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8bde, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8bdf, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),

sound/pci/au88x0/au88x0.c

+4 −4
Original line number Diff line number Diff line
@@ -280,11 +280,11 @@ __snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) 


	// (5)

	err = pci_read_config_word(pci, PCI_DEVICE_ID, &chip->device);

	if (err < 0)

		return err;

	if (err)

		return pcibios_err_to_errno(err);

	err = pci_read_config_word(pci, PCI_VENDOR_ID, &chip->vendor);

	if (err < 0)

		return err;

	if (err)

		return pcibios_err_to_errno(err);

	chip->rev = pci->revision;

#ifdef CHIP_AU8830

	if ((chip->rev) != 0xfe && (chip->rev) != 0xfa) {

sound/usb/mixer.c

+1 −1
Original line number Diff line number Diff line
@@ -921,7 +921,7 @@ static int parse_term_uac2_clock_source(struct mixer_build *state, 
{

	struct uac_clock_source_descriptor *d = p1;



	term->type = UAC3_CLOCK_SOURCE << 16; /* virtual type */

	term->type = UAC2_CLOCK_SOURCE << 16; /* virtual type */

	term->id = id;

	term->name = d->iClockSource;

	return 0;

sound/usb/quirks.c

+3 −0
Original line number Diff line number Diff line
@@ -2030,6 +2030,7 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, 
	case USB_ID(0x249c, 0x9326): /* M2Tech Young MkIII */

	case USB_ID(0x2616, 0x0106): /* PS Audio NuWave DAC */

	case USB_ID(0x2622, 0x0041): /* Audiolab M-DAC+ */

	case USB_ID(0x2622, 0x0061): /* LEAK Stereo 230 */

	case USB_ID(0x278b, 0x5100): /* Rotel RC-1590 */

	case USB_ID(0x27f7, 0x3002): /* W4S DAC-2v2SE */

	case USB_ID(0x29a2, 0x0086): /* Mutec MC3+ USB */
@@ -2428,6 +2429,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { 
		   QUIRK_FLAG_DSD_RAW),

	VENDOR_FLG(0x25ce, /* Mytek devices */

		   QUIRK_FLAG_DSD_RAW),

	VENDOR_FLG(0x2622, /* IAG Limited devices */

		   QUIRK_FLAG_DSD_RAW),

	VENDOR_FLG(0x278b, /* Rotel? */

		   QUIRK_FLAG_DSD_RAW),

	VENDOR_FLG(0x292b, /* Gustard/Ess based devices */