Merge branch 'for-linus' into for-next (473d5ae8) · Commits · EulixOS / Software / Kernel

sound/drivers/aloop.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -1571,6 +1571,14 @@ static int loopback_mixer_new(struct loopback *loopback, int notify)
		return -ENOMEM;
		kctl->id.device = dev;
		kctl->id.subdevice = substr;

		/* Add the control before copying the id so that
		* the numid field of the id is set in the copy.
		*/
		err = snd_ctl_add(card, kctl);
		if (err < 0)
		return err;

		switch (idx) {
		case ACTIVE_IDX:
		setup->active_id = kctl->id;
		@@ -1587,9 +1595,6 @@ static int loopback_mixer_new(struct loopback *loopback, int notify)
		default:
		break;
		}
		err = snd_ctl_add(card, kctl);
		if (err < 0)
		return err;
		}
		}
		}

sound/pci/hda/hda_intel.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -989,8 +989,12 @@ static int azx_prepare(struct device *dev)
		struct snd_card *card = dev_get_drvdata(dev);
		struct azx *chip;

		if (!azx_is_pm_ready(card))
		return 0;

		chip = card->private_data;
		chip->pm_prepared = 1;
		snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);

		flush_work(&azx_bus(chip)->unsol_work);

		@@ -1005,7 +1009,11 @@ static void azx_complete(struct device *dev)
		struct snd_card *card = dev_get_drvdata(dev);
		struct azx *chip;

		if (!azx_is_pm_ready(card))
		return;

		chip = card->private_data;
		snd_power_change_state(card, SNDRV_CTL_POWER_D0);
		chip->pm_prepared = 0;
		}

sound/pci/hda/patch_conexant.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -944,6 +944,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {
		SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE),
		SND_PCI_QUIRK(0x103c, 0x8402, "HP ProBook 645 G4", CXT_FIXUP_MUTE_LED_GPIO),
		SND_PCI_QUIRK(0x103c, 0x8427, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED),
		SND_PCI_QUIRK(0x103c, 0x844f, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED),
		SND_PCI_QUIRK(0x103c, 0x8455, "HP Z2 G4", CXT_FIXUP_HP_MIC_NO_PRESENCE),
		SND_PCI_QUIRK(0x103c, 0x8456, "HP Z2 G4 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE),
		SND_PCI_QUIRK(0x103c, 0x8457, "HP Z2 G4 mini", CXT_FIXUP_HP_MIC_NO_PRESENCE),

sound/pci/hda/patch_realtek.c

+19 −1

Original line number	Diff line number	Diff line
		@@ -3934,6 +3934,15 @@ static void alc271_fixup_dmic(struct hda_codec *codec,
		snd_hda_sequence_write(codec, verbs);
		}

		/* Fix the speaker amp after resume, etc */
		static void alc269vb_fixup_aspire_e1_coef(struct hda_codec *codec,
		const struct hda_fixup *fix,
		int action)
		{
		if (action == HDA_FIXUP_ACT_INIT)
		alc_update_coef_idx(codec, 0x0d, 0x6000, 0x6000);
		}

		static void alc269_fixup_pcm_44k(struct hda_codec *codec,
		const struct hda_fixup *fix, int action)
		{
		@@ -5263,7 +5272,7 @@ static void alc_determine_headset_type(struct hda_codec *codec)
		case 0x10ec0274:
		case 0x10ec0294:
		alc_process_coef_fw(codec, coef0274);
		msleep(80);
		msleep(850);
		val = alc_read_coef_idx(codec, 0x46);
		is_ctia = (val & 0x00f0) == 0x00f0;
		break;
		@@ -5447,6 +5456,7 @@ static void alc_update_headset_jack_cb(struct hda_codec *codec,
		struct hda_jack_callback *jack)
		{
		snd_hda_gen_hp_automute(codec, jack);
		alc_update_headset_mode(codec);
		}

		static void alc_probe_headset_mode(struct hda_codec *codec)
		@@ -6307,6 +6317,7 @@ enum {
		ALC283_FIXUP_HEADSET_MIC,
		ALC255_FIXUP_MIC_MUTE_LED,
		ALC282_FIXUP_ASPIRE_V5_PINS,
		ALC269VB_FIXUP_ASPIRE_E1_COEF,
		ALC280_FIXUP_HP_GPIO4,
		ALC286_FIXUP_HP_GPIO_LED,
		ALC280_FIXUP_HP_GPIO2_MIC_HOTKEY,
		@@ -6985,6 +6996,10 @@ static const struct hda_fixup alc269_fixups[] = {
		{ },
		},
		},
		[ALC269VB_FIXUP_ASPIRE_E1_COEF] = {
		.type = HDA_FIXUP_FUNC,
		.v.func = alc269vb_fixup_aspire_e1_coef,
		},
		[ALC280_FIXUP_HP_GPIO4] = {
		.type = HDA_FIXUP_FUNC,
		.v.func = alc280_fixup_hp_gpio4,
		@@ -7907,6 +7922,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
		SND_PCI_QUIRK(0x1025, 0x0762, "Acer Aspire E1-472", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572),
		SND_PCI_QUIRK(0x1025, 0x0775, "Acer Aspire E1-572", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572),
		SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS),
		SND_PCI_QUIRK(0x1025, 0x0840, "Acer Aspire E1", ALC269VB_FIXUP_ASPIRE_E1_COEF),
		SND_PCI_QUIRK(0x1025, 0x101c, "Acer Veriton N2510G", ALC269_FIXUP_LIFEBOOK),
		SND_PCI_QUIRK(0x1025, 0x102b, "Acer Aspire C24-860", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE),
		SND_PCI_QUIRK(0x1025, 0x1065, "Acer Aspire C20-820", ALC269VC_FIXUP_ACER_HEADSET_MIC),
		@@ -8064,6 +8080,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
		ALC285_FIXUP_HP_GPIO_AMP_INIT),
		SND_PCI_QUIRK(0x103c, 0x87c8, "HP", ALC287_FIXUP_HP_GPIO_LED),
		SND_PCI_QUIRK(0x103c, 0x87e5, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
		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, 0x87f7, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),
		@@ -8400,6 +8417,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
		{.id = ALC283_FIXUP_HEADSET_MIC, .name = "alc283-headset"},
		{.id = ALC255_FIXUP_MIC_MUTE_LED, .name = "alc255-dell-mute"},
		{.id = ALC282_FIXUP_ASPIRE_V5_PINS, .name = "aspire-v5"},
		{.id = ALC269VB_FIXUP_ASPIRE_E1_COEF, .name = "aspire-e1-coef"},
		{.id = ALC280_FIXUP_HP_GPIO4, .name = "hp-gpio4"},
		{.id = ALC286_FIXUP_HP_GPIO_LED, .name = "hp-gpio-led"},
		{.id = ALC280_FIXUP_HP_GPIO2_MIC_HOTKEY, .name = "hp-gpio2-hotkey"},

sound/soc/bcm/cygnus-ssp.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1348,8 +1348,10 @@ static int cygnus_ssp_probe(struct platform_device *pdev)
		&cygnus_ssp_dai[active_port_count]);

		/* negative is err, 0 is active and good, 1 is disabled */
		if (err < 0)
		if (err < 0) {
		of_node_put(child_node);
		return err;
		}
		else if (!err) {
		dev_dbg(dev, "Activating DAI: %s\n",
		cygnus_ssp_dai[active_port_count].name);