Commit 34417833 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "No surprise here, only a collection of device-specific fixes for
  USB-audio and HD-audio at this time"

* tag 'sound-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/hdmi: Cancel pending works before suspend
  ALSA: hda: Avoid spurious unsol event handling during S3/S4
  ALSA: hda: Flush pending unsolicited events before suspend
  ALSA: usb-audio: fix use after free in usb_audio_disconnect
  ALSA: usb-audio: fix NULL ptr dereference in usb_audio_probe
  ALSA: hda/ca0132: Add Sound BlasterX AE-5 Plus support
  ALSA: hda: Drop the BATCH workaround for AMD controllers
  ALSA: hda/conexant: Add quirk for mute LED control on HP ZBook G5
  ALSA: usb-audio: Apply the control quirk to Plantronics headsets
  ALSA: usb-audio: Fix "cannot get freq eq" errors on Dell AE515 sound bar
  ALSA: hda: ignore invalid NHLT table
  ALSA: usb-audio: Disable USB autosuspend properly in setup_disable_autosuspend()
  ALSA: usb: Add Plantronics C320-M USB ctrl msg delay quirk
parents 568099a7 eea46a08

sound/hda/intel-nhlt.c

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt) 
	if (!nhlt)

		return 0;



	if (nhlt->header.length <= sizeof(struct acpi_table_header)) {

		dev_warn(dev, "Invalid DMIC description table\n");

		return 0;

	}



	for (j = 0, epnt = nhlt->desc; j < nhlt->endpoint_count; j++,

	     epnt = (struct nhlt_endpoint *)((u8 *)epnt + epnt->length)) {

sound/pci/hda/hda_bind.c

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ static void hda_codec_unsol_event(struct hdac_device *dev, unsigned int ev) 
	if (codec->bus->shutdown)

		return;



	/* ignore unsol events during system suspend/resume */

	if (codec->core.dev.power.power_state.event != PM_EVENT_ON)

		return;



	if (codec->patch_ops.unsol_event)

		codec->patch_ops.unsol_event(codec, ev);

}

sound/pci/hda/hda_controller.c

+0 −7
Original line number Diff line number Diff line
@@ -609,13 +609,6 @@ static int azx_pcm_open(struct snd_pcm_substream *substream) 
				     20,

				     178000000);



	/* by some reason, the playback stream stalls on PulseAudio with

	 * tsched=1 when a capture stream triggers.  Until we figure out the

	 * real cause, disable tsched mode by telling the PCM info flag.

	 */

	if (chip->driver_caps & AZX_DCAPS_AMD_WORKAROUND)

		runtime->hw.info |= SNDRV_PCM_INFO_BATCH;



	if (chip->align_buffer_size)

		/* constrain buffer sizes to be multiple of 128

		   bytes. This is more efficient in terms of memory

sound/pci/hda/hda_intel.c

+2 −0
Original line number Diff line number Diff line
@@ -1026,6 +1026,8 @@ static int azx_prepare(struct device *dev) 
	chip = card->private_data;

	chip->pm_prepared = 1;



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



	/* HDA controller always requires different WAKEEN for runtime suspend

	 * and system suspend, so don't use direct-complete here.

	 */

sound/pci/hda/patch_ca0132.c

+1 −0
Original line number Diff line number Diff line
@@ -1309,6 +1309,7 @@ static const struct snd_pci_quirk ca0132_quirks[] = { 
	SND_PCI_QUIRK(0x1102, 0x0013, "Recon3D", QUIRK_R3D),

	SND_PCI_QUIRK(0x1102, 0x0018, "Recon3D", QUIRK_R3D),

	SND_PCI_QUIRK(0x1102, 0x0051, "Sound Blaster AE-5", QUIRK_AE5),

	SND_PCI_QUIRK(0x1102, 0x0191, "Sound Blaster AE-5 Plus", QUIRK_AE5),

	SND_PCI_QUIRK(0x1102, 0x0081, "Sound Blaster AE-7", QUIRK_AE7),

	{}

};