Commit 3de62951 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Just a collection of small fixes here: the most outstanding one is the
  re-application of USB-audio lowlatency support that was reverted in
  the previous PR. The rest are device-specific quirks/fixes, spelling
  fixes and a regression fix for the old intel8x0 driver"

* tag 'sound-fix-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: intel8x0: Fix breakage at ac97 clock measurement
  ALSA: usb-audio: Reduce latency at playback start, take#2
  ALSA: isa: Fix error return code in snd_cmi8330_probe()
  ALSA: emux: fix spelling mistakes
  ALSA: usb-audio: fix spelling mistakes
  ALSA: bebob: correct duplicated entries with TerraTec OUI
  ALSA: usx2y: fix spelling mistakes
  ALSA: x86: fix spelling mistakes
  ALSA: hda/realtek: fix mute led of the HP Pavilion 15-eh1xxx series
parents 5a7f7fc5 24d1e494

sound/firewire/bebob/bebob.c

+2 −3
Original line number Diff line number Diff line
@@ -403,8 +403,6 @@ static const struct ieee1394_device_id bebob_id_table[] = { 
	SND_BEBOB_DEV_ENTRY(VEN_APOGEE, 0x01eeee, &spec_normal),

	/* ESI, Quatafire610 */

	SND_BEBOB_DEV_ENTRY(VEN_ESI, 0x00010064, &spec_normal),

	// AcousticReality, eARMasterOne. Terratec OEM.

	SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000002, &spec_normal),

	/* CME, MatrixKFW */

	SND_BEBOB_DEV_ENTRY(VEN_CME, 0x00030000, &spec_normal),

	// Phonic Helix Board 12 FireWire MkII.
@@ -434,7 +432,8 @@ static const struct ieee1394_device_id bebob_id_table[] = { 
	SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000007, &yamaha_terratec_spec),

	/* TerraTec Electronic GmbH, EWS MIC2/MIC8 */

	SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000005, &spec_normal),

	/* Terratec Electronic GmbH, Aureon 7.1 Firewire */

	// Terratec Electronic GmbH, Aureon 7.1 Firewire.

	// AcousticReality, eAR Master One, Eroica, Figaro, and Ciaccona. Perhaps Terratec OEM.

	SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000002, &spec_normal),

	/* Yamaha, GO44 */

	SND_BEBOB_DEV_ENTRY(VEN_YAMAHA, 0x0010000b, &yamaha_terratec_spec),

sound/isa/cmi8330.c

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ static int snd_cmi8330_probe(struct snd_card *card, int dev) 
	}

	if (acard->sb->hardware != SB_HW_16) {

		snd_printk(KERN_ERR PFX "SB16 not found during probe\n");

		return err;

		return -ENODEV;

	}



	snd_wss_out(acard->wss, CS4231_MISC_INFO, 0x40); /* switch on MODE2 */

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -8442,6 +8442,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x888d, "HP ZBook Power 15.6 inch G8 Mobile Workstation PC", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x8898, "HP EliteBook 845 G8 Notebook PC", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x103c, 0x88d0, "HP Pavilion 15-eh1xxx (mainboard 88D0)", ALC287_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),

	SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

sound/pci/intel8x0.c

+1 −1
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ static inline void snd_intel8x0_update(struct intel8x0 *chip, struct ichdev *ich 
	int status, civ, i, step;

	int ack = 0;



	if (!ichdev->prepared || ichdev->suspended)

	if (!(ichdev->prepared || chip->in_measurement) || ichdev->suspended)

		return;



	spin_lock_irqsave(&chip->reg_lock, flags);

sound/synth/emux/emux_nrpn.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static const int gs_sense[] = 
	DEF_FX_VIBRATE, DEF_FX_VIBDEPTH, DEF_FX_VIBDELAY

};



/* effect sensitivies for XG controls:

/* effect sensitivities for XG controls:

 * adjusted for chaos 8MB soundfonts

 */

static const int xg_sense[] =