Merge branch 'for-linus' into for-next (d71bb23a) · Commits · e / devices / android_kernel_teracube_mt6765

sound/pci/hda/hda_auto_parser.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -884,6 +884,8 @@ void snd_hda_apply_fixup(struct hda_codec *codec, int action)
		}
		EXPORT_SYMBOL_GPL(snd_hda_apply_fixup);

		#define IGNORE_SEQ_ASSOC (~(AC_DEFCFG_SEQUENCE \| AC_DEFCFG_DEF_ASSOC))

		static bool pin_config_match(struct hda_codec *codec,
		const struct hda_pintbl *pins)
		{
		@@ -901,7 +903,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 & 0xfffffff0) == (cfg & 0xfffffff0))
		if ((t_pins->val & IGNORE_SEQ_ASSOC) == (cfg & IGNORE_SEQ_ASSOC))
		break;
		else if ((cfg & 0xf0000000) == 0x40000000 && (t_pins->val & 0xf0000000) == 0x40000000)
		break;

sound/pci/hda/patch_conexant.c

+17 −0

Original line number	Diff line number	Diff line
		@@ -262,6 +262,7 @@ enum {
		CXT_FIXUP_CAP_MIX_AMP_5047,
		CXT_FIXUP_MUTE_LED_EAPD,
		CXT_FIXUP_HP_SPECTRE,
		CXT_FIXUP_HP_GATE_MIC,
		};

		/* for hda_fixup_thinkpad_acpi() */
		@@ -633,6 +634,17 @@ static void cxt_fixup_cap_mix_amp_5047(struct hda_codec *codec,
		(1 << AC_AMPCAP_MUTE_SHIFT));
		}

		static void cxt_fixup_hp_gate_mic_jack(struct hda_codec *codec,
		const struct hda_fixup *fix,
		int action)
		{
		/* the mic pin (0x19) doesn't give an unsolicited event;
		* probe the mic pin together with the headphone pin (0x16)
		*/
		if (action == HDA_FIXUP_ACT_PROBE)
		snd_hda_jack_set_gating_jack(codec, 0x19, 0x16);
		}

		/* ThinkPad X200 & co with cxt5051 */
		static const struct hda_pintbl cxt_pincfg_lenovo_x200[] = {
		{ 0x16, 0x042140ff }, /* HP (seq# overridden) */
		@@ -774,6 +786,10 @@ static const struct hda_fixup cxt_fixups[] = {
		{ }
		}
		},
		[CXT_FIXUP_HP_GATE_MIC] = {
		.type = HDA_FIXUP_FUNC,
		.v.func = cxt_fixup_hp_gate_mic_jack,
		},
		};

		static const struct snd_pci_quirk cxt5045_fixups[] = {
		@@ -824,6 +840,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {
		SND_PCI_QUIRK(0x1025, 0x054c, "Acer Aspire 3830TG", CXT_FIXUP_ASPIRE_DMIC),
		SND_PCI_QUIRK(0x1025, 0x054f, "Acer Aspire 4830T", CXT_FIXUP_ASPIRE_DMIC),
		SND_PCI_QUIRK(0x103c, 0x8174, "HP Spectre x360", CXT_FIXUP_HP_SPECTRE),
		SND_PCI_QUIRK(0x103c, 0x8115, "HP Z1 Gen3", CXT_FIXUP_HP_GATE_MIC),
		SND_PCI_QUIRK(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN),
		SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT_FIXUP_OLPC_XO),
		SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400", CXT_PINCFG_LENOVO_TP410),

sound/usb/endpoint.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -384,6 +384,9 @@ static void snd_complete_urb(struct urb *urb)
		if (unlikely(atomic_read(&ep->chip->shutdown)))
		goto exit_clear;

		if (unlikely(!test_bit(EP_FLAG_RUNNING, &ep->flags)))
		goto exit_clear;

		if (usb_pipeout(ep->pipe)) {
		retire_outbound_urb(ep, ctx);
		/* can be stopped during retire callback */
		@@ -534,6 +537,11 @@ static int wait_clear_urbs(struct snd_usb_endpoint *ep)
		alive, ep->ep_num);
		clear_bit(EP_FLAG_STOPPING, &ep->flags);

		ep->data_subs = NULL;
		ep->sync_slave = NULL;
		ep->retire_data_urb = NULL;
		ep->prepare_data_urb = NULL;

		return 0;
		}

		@@ -1006,10 +1014,6 @@ void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep)

		if (--ep->use_count == 0) {
		deactivate_urbs(ep, false);
		ep->data_subs = NULL;
		ep->sync_slave = NULL;
		ep->retire_data_urb = NULL;
		ep->prepare_data_urb = NULL;
		set_bit(EP_FLAG_STOPPING, &ep->flags);
		}
		}

sound/usb/mixer.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -932,9 +932,10 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval,
		case USB_ID(0x046d, 0x0826): /* HD Webcam c525 */
		case USB_ID(0x046d, 0x08ca): /* Logitech Quickcam Fusion */
		case USB_ID(0x046d, 0x0991):
		case USB_ID(0x046d, 0x09a2): /* QuickCam Communicate Deluxe/S7500 */
		/* Most audio usb devices lie about volume resolution.
		* Most Logitech webcams have res = 384.
		* Proboly there is some logitech magic behind this number --fishor
		* Probably there is some logitech magic behind this number --fishor
		*/
		if (!strcmp(kctl->id.name, "Mic Capture Volume")) {
		usb_audio_info(chip,