From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Mar 2024 21:54:49 +0000 (-0700)
Subject: Merge tag 'sound-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai... 
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/529b10c0091d6bda6d54fc72711a28f3ea01a72c?hp=-c

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

Pull sound fixes from Takashi Iwai:
 "A collection of device-specific small fixes: a series of fixes for
  TAS2781 HD-audio codec, ASoC SOF, Cirrus CS35L56 and a couple of
  legacy drivers"

* tag 'sound-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/tas2781: remove useless dev_dbg from playback_hook
  ALSA: hda/tas2781: add debug statements to kcontrols
  ALSA: hda/tas2781: add locks to kcontrols
  ALSA: hda/tas2781: remove digital gain kcontrol
  ALSA: aoa: avoid false-positive format truncation warning
  ALSA: sh: aica: reorder cleanup operations to avoid UAF bugs
  ALSA: hda: cs35l56: Set the init_done flag before component_add()
  ALSA: hda: cs35l56: Raise device name message log level
  ASoC: SOF: ipc4-topology: support NHLT device type
  ALSA: hda: intel-nhlt: add intel_nhlt_ssp_device_type() function
---

529b10c0091d6bda6d54fc72711a28f3ea01a72c
diff --combined sound/aoa/soundbus/i2sbus/core.c
index b8ff5cccd0c8,e627ffffa1f2..5431d2c49421
--- a/sound/aoa/soundbus/i2sbus/core.c
+++ b/sound/aoa/soundbus/i2sbus/core.c
@@@ -158,7 -158,7 +158,7 @@@ static int i2sbus_add_dev(struct macio_
  	struct device_node *child, *sound = NULL;
  	struct resource *r;
  	int i, layout = 0, rlen, ok = force;
- 	char node_name[6];
+ 	char node_name[8];
  	static const char *rnames[] = { "i2sbus: %pOFn (control)",
  					"i2sbus: %pOFn (tx)",
  					"i2sbus: %pOFn (rx)" };
@@@ -365,13 -365,15 +365,13 @@@ static int i2sbus_probe(struct macio_de
  	return 0;
  }
  
 -static int i2sbus_remove(struct macio_dev* dev)
 +static void i2sbus_remove(struct macio_dev *dev)
  {
  	struct i2sbus_control *control = dev_get_drvdata(&dev->ofdev.dev);
  	struct i2sbus_dev *i2sdev, *tmp;
  
  	list_for_each_entry_safe(i2sdev, tmp, &control->list, item)
  		soundbus_remove_one(&i2sdev->sound);
 -
 -	return 0;
  }
  
  #ifdef CONFIG_PM