Commit 1a10d5b0 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next

parents e28ac04a 93ab3eaf

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -8425,6 +8425,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x87f2, "HP ProBook 640 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x87f4, "HP", ALC287_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x87f5, "HP", ALC287_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x87f6, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),

	SND_PCI_QUIRK(0x103c, 0x87f7, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),

	SND_PCI_QUIRK(0x103c, 0x8805, "HP ProBook 650 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x880d, "HP EliteBook 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),

sound/usb/endpoint.c

+5 −0
Original line number Diff line number Diff line
@@ -1293,6 +1293,11 @@ int snd_usb_endpoint_configure(struct snd_usb_audio *chip, 
	 * to be set up before parameter setups

	 */

	iface_first = ep->cur_audiofmt->protocol == UAC_VERSION_1;

	/* Workaround for Sony WALKMAN NW-A45 DAC;

	 * it requires the interface setup at first like UAC1

	 */

	if (chip->usb_id == USB_ID(0x054c, 0x0b8c))

		iface_first = true;

	if (iface_first) {

		err = endpoint_set_interface(chip, ep, true);

		if (err < 0)