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

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

Pull sound fixes from Takashi Iwai:
 "A large collection of fixes around this time.

  All small and mostly trivial fixes.

   - Lots of fixes for the new -Wformat-truncation warnings

   - A fix in ALSA rawmidi core regression and UMP handling

   - Series of Cirrus codec fixes

   - ASoC Intel and Realtek codec fixes

   - Usual HD- and USB-audio quirks and AMD ASoC quirks"

* tag 'sound-6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (64 commits)
  ALSA: hda/realtek - ALC287 Realtek I2S speaker platform support
  ALSA: hda: cs35l56: Use the new RUNTIME_PM_OPS() macro
  ALSA: usb-audio: scarlett_gen2: Fix another -Wformat-truncation warning
  ALSA: rawmidi: Fix NULL dereference at proc read
  ASoC: SOF: core: Only call sof_ops_free() on remove if the probe was successful
  ASoC: SOF: Intel: MTL: Reduce the DSP init timeout
  ASoC: cs42l43: Add shared IRQ flag for shutters
  ASoC: imx-audmix: Fix return error with devm_clk_get()
  ASoC: hdaudio.c: Add missing check for devm_kstrdup
  ALSA: riptide: Fix -Wformat-truncation warning for longname string
  ALSA: cs4231: Fix -Wformat-truncation warning for longname string
  ALSA: ad1848: Fix -Wformat-truncation warning for longname string
  ALSA: hda: generic: Check potential mixer name string truncation
  ALSA: cmipci: Fix -Wformat-truncation warning
  ALSA: firewire: Fix -Wformat-truncation warning for MIDI stream names
  ALSA: firewire: Fix -Wformat-truncation warning for longname string
  ALSA: xen: Fix -Wformat-truncation warning
  ALSA: opti9x: Fix -Wformat-truncation warning
  ALSA: es1688: Fix -Wformat-truncation warning
  ALSA: cs4236: Fix -Wformat-truncation warning
  ...
parents b300c0fd 0eb0e272

Documentation/sound/designs/midi-2.0.rst

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ topology based on those information. When the device is older and 
doesn't respond to the new UMP inquiries, the driver falls back and

builds the topology based on Group Terminal Block (GTB) information

from the USB descriptor.  Some device might be screwed up by the

unexpected UMP command; in such a case, pass `midi2_probe=0` option to

snd-usb-audio driver for skipping the UMP v1.1 inquiries.

unexpected UMP command; in such a case, pass `midi2_ump_probe=0`

option to snd-usb-audio driver for skipping the UMP v1.1 inquiries.



When the MIDI 2.0 device is probed, the kernel creates a rawmidi

device for each UMP Endpoint of the device.  Its device name is

drivers/firmware/cirrus/cs_dsp.c

+17 −17
Original line number Diff line number Diff line
@@ -1863,7 +1863,7 @@ static int cs_dsp_adsp2_setup_algs(struct cs_dsp *dsp) 
		return PTR_ERR(adsp2_alg);



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

		cs_dsp_info(dsp,

		cs_dsp_dbg(dsp,

			   "%d: ID %x v%d.%d.%d XM@%x YM@%x ZM@%x\n",

			   i, be32_to_cpu(adsp2_alg[i].alg.id),

			   (be32_to_cpu(adsp2_alg[i].alg.ver) & 0xff0000) >> 16,
@@ -1996,7 +1996,7 @@ static int cs_dsp_halo_setup_algs(struct cs_dsp *dsp) 
		return PTR_ERR(halo_alg);



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

		cs_dsp_info(dsp,

		cs_dsp_dbg(dsp,

			   "%d: ID %x v%d.%d.%d XM@%x YM@%x\n",

			   i, be32_to_cpu(halo_alg[i].alg.id),

			   (be32_to_cpu(halo_alg[i].alg.ver) & 0xff0000) >> 16,

sound/core/init.c

+2 −5
Original line number Diff line number Diff line
@@ -278,9 +278,6 @@ static int snd_card_init(struct snd_card *card, struct device *parent, 
			 size_t extra_size)

{

	int err;

#ifdef CONFIG_SND_DEBUG

	char name[8];

#endif



	if (extra_size > 0)

		card->private_data = (char *)card + sizeof(struct snd_card);
@@ -364,8 +361,8 @@ static int snd_card_init(struct snd_card *card, struct device *parent, 
	}



#ifdef CONFIG_SND_DEBUG

	sprintf(name, "card%d", idx);

	card->debugfs_root = debugfs_create_dir(name, sound_debugfs_root);

	card->debugfs_root = debugfs_create_dir(dev_name(&card->card_dev),

						sound_debugfs_root);

#endif

	return 0;

sound/core/rawmidi.c

+1 −1
Original line number Diff line number Diff line
@@ -1770,7 +1770,7 @@ static void snd_rawmidi_proc_info_read(struct snd_info_entry *entry, 
	if (IS_ENABLED(CONFIG_SND_UMP))

		snd_iprintf(buffer, "Type: %s\n",

			    rawmidi_is_ump(rmidi) ? "UMP" : "Legacy");

	if (rmidi->ops->proc_read)

	if (rmidi->ops && rmidi->ops->proc_read)

		rmidi->ops->proc_read(entry, buffer);

	mutex_lock(&rmidi->open_mutex);

	if (rmidi->info_flags & SNDRV_RAWMIDI_INFO_OUTPUT) {

sound/core/seq/seq_midi.c

+2 −2
Original line number Diff line number Diff line
@@ -349,9 +349,9 @@ snd_seq_midisynth_probe(struct device *_dev) 
		if (! port->name[0]) {

			if (info->name[0]) {

				if (ports > 1)

					snprintf(port->name, sizeof(port->name), "%s-%u", info->name, p);

					scnprintf(port->name, sizeof(port->name), "%s-%u", info->name, p);

				else

					snprintf(port->name, sizeof(port->name), "%s", info->name);

					scnprintf(port->name, sizeof(port->name), "%s", info->name);

			} else {

				/* last resort */

				if (ports > 1)