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

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

Pull sound fixes from Takashi Iwai:
 "At this time, the majority of changes are for pending ASoC fixes while
  a few usual HD-audio and USB-audio quirks are found.

  Almost all patches are small device-specific fixes, and nothing
  worrisome stands out, so far"

* tag 'sound-5.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (37 commits)
  ALSA: hda/realtek: Add quirk for Clevo NP70PNP
  ALSA: hda: intel-dsp-config: Add RaptorLake PCI IDs
  ALSA: hda/realtek: Enable mute/micmute LEDs and limit mic boost on EliteBook 845/865 G9
  ALSA: usb-audio: Clear MIDI port active flag after draining
  ALSA: usb-audio: add mapping for MSI MAG X570S Torpedo MAX.
  ALSA: hda/i915: Fix one too many pci_dev_put()
  ALSA: hda/hdmi: add HDMI codec VID for Raptorlake-P
  ALSA: hda/hdmi: fix warning about PCM count when used with SOF
  sound/oss/dmasound: fix 'dmasound_setup' defined but not used
  firmware: cs_dsp: Fix overrun of unterminated control name string
  ASoC: codecs: Fix an error handling path in (rx|tx|va)_macro_probe()
  ASoC: Intel: sof_es8336: Add a quirk for Huawei Matebook D15
  ASoC: Intel: sof_es8336: add a quirk for headset at mic1 port
  ASoC: Intel: sof_es8336: support a separate gpio to control headphone
  ASoC: Intel: sof_es8336: simplify speaker gpio naming
  ASoC: wm8731: Disable the regulator when probing fails
  ASoC: Intel: soc-acpi: correct device endpoints for max98373
  ASoC: codecs: wcd934x: do not switch off SIDO Buck when codec is in use
  ASoC: SOF: topology: Fix memory leak in sof_control_load()
  ASoC: SOF: topology: cleanup dailinks on widget unload
  ...
parents 281b9d9a 86222af0

drivers/firmware/cirrus/cs_dsp.c

+1 −2
Original line number Diff line number Diff line
@@ -955,8 +955,7 @@ static int cs_dsp_create_control(struct cs_dsp *dsp, 
	ctl->alg_region = *alg_region;

	if (subname && dsp->fw_ver >= 2) {

		ctl->subname_len = subname_len;

		ctl->subname = kmemdup(subname,

				       strlen(subname) + 1, GFP_KERNEL);

		ctl->subname = kasprintf(GFP_KERNEL, "%.*s", subname_len, subname);

		if (!ctl->subname) {

			ret = -ENOMEM;

			goto err_ctl;

include/sound/soc-component.h

+4 −0
Original line number Diff line number Diff line
@@ -179,6 +179,10 @@ struct snd_soc_component_driver { 
				  struct snd_pcm_hw_params *params);

	bool use_dai_pcm_id;	/* use DAI link PCM ID as PCM device number */

	int be_pcm_base;	/* base device ID for all BE PCMs */



#ifdef CONFIG_DEBUG_FS

	const char *debugfs_prefix;

#endif

};



struct snd_soc_component {

sound/hda/hdac_i915.c

+3 −4
Original line number Diff line number Diff line
@@ -127,11 +127,10 @@ static int i915_gfx_present(struct pci_dev *hdac_pci) 
		display_dev = pci_get_class(class, display_dev);



		if (display_dev && display_dev->vendor == PCI_VENDOR_ID_INTEL &&

		    connectivity_check(display_dev, hdac_pci))

			match = true;



		    connectivity_check(display_dev, hdac_pci)) {

			pci_dev_put(display_dev);



			match = true;

		}

	} while (!match && display_dev);



	return match;

sound/hda/intel-dsp-config.c

+9 −0
Original line number Diff line number Diff line
@@ -424,6 +424,15 @@ static const struct config_entry config_table[] = { 
		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,

		.device = 0x54c8,

	},

	/* RaptorLake-P */

	{

		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,

		.device = 0x51ca,

	},

	{

		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,

		.device = 0x51cb,

	},

#endif



};

sound/oss/dmasound/dmasound_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1428,7 +1428,7 @@ void dmasound_deinit(void) 
		unregister_sound_dsp(sq_unit);

}



static int dmasound_setup(char *str)

static int __maybe_unused dmasound_setup(char *str)

{

	int ints[6], size;