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

Commit 7c9a0fc7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-4.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "We have a core fix in the compat code for covering a potential race
  (double references), but it's a very minor change.

  The rest are all small device-specific quirks, as well as a correction
  of the new UAC3 support code"

* tag 'sound-4.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: usb-audio: Use Class Specific EP for UAC3 devices.
  ALSA: hda/realtek - Clevo P950ER ALC1220 Fixup
  ALSA: usb: mixer: volume quirk for CM102-A+/102S+
  ALSA: hda: Add Lenovo C50 All in one to the power_save blacklist
  ALSA: control: fix a redundant-copy issue
parents 3e9245c5 c99f0802

sound/core/control_compat.c

+1 −2
Original line number Diff line number Diff line
@@ -396,8 +396,7 @@ static int snd_ctl_elem_add_compat(struct snd_ctl_file *file, 
	if (copy_from_user(&data->id, &data32->id, sizeof(data->id)) ||

	    copy_from_user(&data->type, &data32->type, 3 * sizeof(u32)))

		goto error;

	if (get_user(data->owner, &data32->owner) ||

	    get_user(data->type, &data32->type))

	if (get_user(data->owner, &data32->owner))

		goto error;

	switch (data->type) {

	case SNDRV_CTL_ELEM_TYPE_BOOLEAN:

sound/pci/hda/hda_intel.c

+2 −0
Original line number Diff line number Diff line
@@ -2210,6 +2210,8 @@ static struct snd_pci_quirk power_save_blacklist[] = { 
	SND_PCI_QUIRK(0x1849, 0x0c0c, "Asrock B85M-ITX", 0),

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

	SND_PCI_QUIRK(0x1043, 0x8733, "Asus Prime X370-Pro", 0),

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

	SND_PCI_QUIRK(0x17aa, 0x36a7, "Lenovo C50 All in one", 0),

	/* https://bugzilla.kernel.org/show_bug.cgi?id=198611 */

	SND_PCI_QUIRK(0x17aa, 0x2227, "Lenovo X1 Carbon 3rd Gen", 0),

	{}

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -2363,6 +2363,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { 
	SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3),

	SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX),

	SND_PCI_QUIRK(0x1558, 0x9501, "Clevo P950HR", ALC1220_FIXUP_CLEVO_P950),

	SND_PCI_QUIRK(0x1558, 0x95e2, "Clevo P950ER", ALC1220_FIXUP_CLEVO_P950),

	SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC882_FIXUP_EAPD),

	SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_FIXUP_EAPD),

	SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", ALC882_FIXUP_LENOVO_Y530),

sound/usb/mixer.c

+8 −0
Original line number Diff line number Diff line
@@ -967,6 +967,14 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval, 
		}

		break;



	case USB_ID(0x0d8c, 0x0103):

		if (!strcmp(kctl->id.name, "PCM Playback Volume")) {

			usb_audio_info(chip,

				 "set volume quirk for CM102-A+/102S+\n");

			cval->min = -256;

		}

		break;



	case USB_ID(0x0471, 0x0101):

	case USB_ID(0x0471, 0x0104):

	case USB_ID(0x0471, 0x0105):

sound/usb/stream.c

+8 −1
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ static int parse_uac_endpoint_attributes(struct snd_usb_audio *chip, 


	if (protocol == UAC_VERSION_1) {

		attributes = csep->bmAttributes;

	} else {

	} else if (protocol == UAC_VERSION_2) {

		struct uac2_iso_endpoint_descriptor *csep2 =

			(struct uac2_iso_endpoint_descriptor *) csep;
@@ -585,6 +585,13 @@ static int parse_uac_endpoint_attributes(struct snd_usb_audio *chip, 
		/* emulate the endpoint attributes of a v1 device */

		if (csep2->bmControls & UAC2_CONTROL_PITCH)

			attributes |= UAC_EP_CS_ATTR_PITCH_CONTROL;

	} else { /* UAC_VERSION_3 */

		struct uac3_iso_endpoint_descriptor *csep3 =

			(struct uac3_iso_endpoint_descriptor *) csep;



		/* emulate the endpoint attributes of a v1 device */

		if (le32_to_cpu(csep3->bmControls) & UAC2_CONTROL_PITCH)

			attributes |= UAC_EP_CS_ATTR_PITCH_CONTROL;

	}



	return attributes;