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

Commit 2f6e24d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-fix-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Here is a collection of small fixes on top of the previous update.

  All small and obvious fixes. Mostly for usual suspects, USB-audio and
  HD-audio, but a few trivial error handling fixes for misc drivers as
  well"

* tag 'sound-fix-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: usb-audio: Always create the interrupt pipe for the mixer
  ALSA: usb-audio: Add insertion control for UAC3 BADD
  ALSA: usb-audio: Change in connectors control creation interface
  ALSA: usb-audio: Add bi-directional terminal types
  ALSA: lx6464es: add error handling for pci_ioremap_bar
  ALSA: sonicvibes: add error handling for snd_ctl_add
  ALSA: usb-audio: Remove explicitly listed Mytek devices
  ALSA: usb-audio: Generic DSD detection for XMOS-based implementations
  ALSA: usb-audio: Add native DSD support for Mytek DACs
  ALSA: hda/realtek - Add shutup hint
  ALSA: usb-audio: Disable the quirk for Nura headset
  ALSA: hda: add dock and led support for HP ProBook 640 G4
  ALSA: hda: add dock and led support for HP EliteBook 830 G5
  ALSA: emu10k1: add error handling for snd_ctl_add
  ALSA: fm801: add error handling for snd_ctl_add
parents becfc5e9 ad6baae6

include/uapi/linux/usb/audio.h

+8 −0
Original line number Diff line number Diff line
@@ -230,6 +230,14 @@ struct uac1_output_terminal_descriptor { 
#define UAC_OUTPUT_TERMINAL_COMMUNICATION_SPEAKER	0x306

#define UAC_OUTPUT_TERMINAL_LOW_FREQ_EFFECTS_SPEAKER	0x307



/* Terminals - 2.4 Bi-directional Terminal Types */

#define UAC_BIDIR_TERMINAL_UNDEFINED			0x400

#define UAC_BIDIR_TERMINAL_HANDSET			0x401

#define UAC_BIDIR_TERMINAL_HEADSET			0x402

#define UAC_BIDIR_TERMINAL_SPEAKER_PHONE		0x403

#define UAC_BIDIR_TERMINAL_ECHO_SUPPRESSING		0x404

#define UAC_BIDIR_TERMINAL_ECHO_CANCELING		0x405



/* Set bControlSize = 2 as default setting */

#define UAC_DT_FEATURE_UNIT_SIZE(ch)		(7 + ((ch) + 1) * 2)

sound/pci/emu10k1/emupcm.c

+3 −1
Original line number Diff line number Diff line
@@ -1858,7 +1858,9 @@ int snd_emu10k1_pcm_efx(struct snd_emu10k1 *emu, int device) 
	if (!kctl)

		return -ENOMEM;

	kctl->id.device = device;

	snd_ctl_add(emu->card, kctl);

	err = snd_ctl_add(emu->card, kctl);

	if (err < 0)

		return err;



	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu->pci), 64*1024, 64*1024);

sound/pci/fm801.c

+12 −4
Original line number Diff line number Diff line
@@ -1068,11 +1068,19 @@ static int snd_fm801_mixer(struct fm801 *chip) 
		if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97, &chip->ac97_sec)) < 0)

			return err;

	}

	for (i = 0; i < FM801_CONTROLS; i++)

		snd_ctl_add(chip->card, snd_ctl_new1(&snd_fm801_controls[i], chip));

	for (i = 0; i < FM801_CONTROLS; i++) {

		err = snd_ctl_add(chip->card,

			snd_ctl_new1(&snd_fm801_controls[i], chip));

		if (err < 0)

			return err;

	}

	if (chip->multichannel) {

		for (i = 0; i < FM801_CONTROLS_MULTI; i++)

			snd_ctl_add(chip->card, snd_ctl_new1(&snd_fm801_controls_multi[i], chip));

		for (i = 0; i < FM801_CONTROLS_MULTI; i++) {

			err = snd_ctl_add(chip->card,

				snd_ctl_new1(&snd_fm801_controls_multi[i], chip));

			if (err < 0)

				return err;

		}

	}

	return 0;

}

sound/pci/hda/patch_conexant.c

+2 −0
Original line number Diff line number Diff line
@@ -958,6 +958,8 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { 
	SND_PCI_QUIRK(0x103c, 0x8079, "HP EliteBook 840 G3", CXT_FIXUP_HP_DOCK),

	SND_PCI_QUIRK(0x103c, 0x807C, "HP EliteBook 820 G3", CXT_FIXUP_HP_DOCK),

	SND_PCI_QUIRK(0x103c, 0x80FD, "HP ProBook 640 G2", CXT_FIXUP_HP_DOCK),

	SND_PCI_QUIRK(0x103c, 0x83b3, "HP EliteBook 830 G5", CXT_FIXUP_HP_DOCK),

	SND_PCI_QUIRK(0x103c, 0x83d3, "HP ProBook 640 G4", CXT_FIXUP_HP_DOCK),

	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(0x103c, 0x814f, "HP ZBook 15u G3", CXT_FIXUP_MUTE_LED_GPIO),

sound/pci/hda/patch_realtek.c

+3 −0
Original line number Diff line number Diff line
@@ -793,6 +793,9 @@ static inline void alc_shutup(struct hda_codec *codec) 
{

	struct alc_spec *spec = codec->spec;



	if (!snd_hda_get_bool_hint(codec, "shutup"))

		return; /* disabled explicitly by hints */



	if (spec && spec->shutup)

		spec->shutup(codec);

	else