Commit 9b132f27 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Resolve conflicts and correct the hex numbers, too.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 5396c4bd b81cbf7a

sound/pci/hda/hda_intel.c

+2 −0
Original line number Diff line number Diff line
@@ -2190,6 +2190,8 @@ static const struct snd_pci_quirk power_save_blacklist[] = { 
	/* https://bugzilla.redhat.com/show_bug.cgi?id=1581607 */

	SND_PCI_QUIRK(0x1558, 0x3501, "Clevo W35xSS_370SS", 0),

	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */

	SND_PCI_QUIRK(0x1558, 0x6504, "Clevo W65_67SB", 0),

	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */

	SND_PCI_QUIRK(0x1028, 0x0497, "Dell Precision T3600", 0),

	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */

	/* Note the P55A-UD3 and Z87-D3HP share the subsys id for the HDA dev */

sound/pci/hda/patch_conexant.c

+1 −0
Original line number Diff line number Diff line
@@ -922,6 +922,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { 
	SND_PCI_QUIRK(0x17aa, 0x215f, "Lenovo T510", CXT_PINCFG_LENOVO_TP410),

	SND_PCI_QUIRK(0x17aa, 0x21ce, "Lenovo T420", CXT_PINCFG_LENOVO_TP410),

	SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520", CXT_PINCFG_LENOVO_TP410),

	SND_PCI_QUIRK(0x17aa, 0x21d2, "Lenovo T420s", CXT_PINCFG_LENOVO_TP410),

	SND_PCI_QUIRK(0x17aa, 0x21da, "Lenovo X220", CXT_PINCFG_LENOVO_TP410),

	SND_PCI_QUIRK(0x17aa, 0x21db, "Lenovo X220-tablet", CXT_PINCFG_LENOVO_TP410),

	SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo IdeaPad Z560", CXT_FIXUP_MUTE_LED_EAPD),

sound/usb/format.c

+3 −0
Original line number Diff line number Diff line
@@ -296,6 +296,9 @@ static int line6_parse_audio_format_rates_quirk(struct snd_usb_audio *chip, 
	case USB_ID(0x0e41, 0x4242): /* Line6 Helix Rack */

	case USB_ID(0x0e41, 0x4244): /* Line6 Helix LT */

	case USB_ID(0x0e41, 0x4246): /* Line6 HX-Stomp */

	case USB_ID(0x0e41, 0x4248): /* Line6 Helix >= fw 2.82 */

	case USB_ID(0x0e41, 0x4249): /* Line6 Helix Rack >= fw 2.82 */

	case USB_ID(0x0e41, 0x424a): /* Line6 Helix LT >= fw 2.82 */

		/* supported rates: 48Khz */

		kfree(fp->rate_table);

		fp->rate_table = kmalloc(sizeof(int), GFP_KERNEL);