Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55d2b190 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next

parents 2e57069c b5337cfe

sound/pci/hda/hda_auto_parser.c

+1 −1
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ static bool pin_config_match(struct hda_codec *codec, 
		for (; t_pins->nid; t_pins++) {

			if (t_pins->nid == nid) {

				found = 1;

				if (t_pins->val == cfg)

				if ((t_pins->val & 0xfffffff0) == (cfg & 0xfffffff0))

					break;

				else if ((cfg & 0xf0000000) == 0x40000000 && (t_pins->val & 0xf0000000) == 0x40000000)

					break;

sound/pci/hda/patch_ca0132.c

+1 −0
Original line number Diff line number Diff line
@@ -780,6 +780,7 @@ static const struct hda_pintbl alienware_pincfgs[] = { 
static const struct snd_pci_quirk ca0132_quirks[] = {

	SND_PCI_QUIRK(0x1028, 0x0685, "Alienware 15 2015", QUIRK_ALIENWARE),

	SND_PCI_QUIRK(0x1028, 0x0688, "Alienware 17 2015", QUIRK_ALIENWARE),

	SND_PCI_QUIRK(0x1028, 0x0708, "Alienware 15 R2 2016", QUIRK_ALIENWARE),

	{}

};

sound/pci/hda/patch_realtek.c

+3 −2
Original line number Diff line number Diff line
@@ -5917,6 +5917,9 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { 
		{0x12, 0x90a60180},

		{0x14, 0x90170120},

		{0x21, 0x02211030}),

	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,

		{0x1b, 0x01011020},

		{0x21, 0x02211010}),

	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,

		{0x12, 0x90a60160},

		{0x14, 0x90170120},
@@ -6907,8 +6910,6 @@ static const struct hda_fixup alc662_fixups[] = { 
		.v.pins = (const struct hda_pintbl[]) {

			{ 0x15, 0x40f000f0 }, /* disabled */

			{ 0x16, 0x40f000f0 }, /* disabled */

			{ 0x18, 0x01014011 }, /* LO */

			{ 0x1a, 0x01014012 }, /* LO */

			{ }

		}

	},

sound/pci/hda/thinkpad_helper.c

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ static void (*old_vmaster_hook)(void *, int); 
static bool is_thinkpad(struct hda_codec *codec)

{

	return (codec->core.subsystem_id >> 16 == 0x17aa) &&

	       (acpi_dev_found("LEN0068") || acpi_dev_found("IBM0068"));

	       (acpi_dev_found("LEN0068") || acpi_dev_found("LEN0268") ||

		acpi_dev_found("IBM0068"));

}



static void update_tpacpi_mute_led(void *private_data, int enabled)

sound/usb/card.c

+2 −1
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ static int snd_usb_audio_free(struct snd_usb_audio *chip) 
		snd_usb_endpoint_free(ep);



	mutex_destroy(&chip->mutex);

	if (!atomic_read(&chip->shutdown))

		dev_set_drvdata(&chip->dev->dev, NULL);

	kfree(chip);

	return 0;