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

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

Pull sound fixes from Takashi Iwai:
 "A collection of fix patches for the 6.16-rc1 merge window.

  Most of changes are about ASoC, especially lots of AVS driver fixes.
  Larger LOCs are seen in TAS571x codec drivers, but the changes are
  trivial and safe. The rest are all device-specific small fixes"

* tag 'sound-fix-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (27 commits)
  ASoC: Intel: avs: boards: Fix rt5663 front end name
  ASoC: Intel: avs: Simplify verification of parse_int_array() result
  ALSA: usb-audio: Add implicit feedback quirk for RODE AI-1
  ALSA: hda: Ignore unsol events for cards being shut down
  ALSA: hda: Add new pci id for AMD GPU display HD audio controller
  ALSA: hda: cs35l41: Constify regmap_irq_chip
  ALSA: usb-audio: Add a quirk for Lenovo Thinkpad Thunderbolt 3 dock
  ASoC: ti: omap-hdmi: Re-add dai_link->platform to fix card init
  ASoC: pcm: Do not open FEs with no BEs connected
  ASoC: rt1320: fix speaker noise when volume bar is 100%
  ASoC: Intel: avs: Include missing string.h
  ASoC: Intel: avs: Verify content returned by parse_int_array()
  ASoC: Intel: avs: Verify kcalloc() status when setting constraints
  ASoC: Intel: avs: Fix paths in MODULE_FIRMWARE hints
  ASoC: Intel: avs: Fix possible null-ptr-deref when initing hw
  ASoC: Intel: avs: Fix PPLCxFMT calculation
  ASoC: Intel: avs: Fix deadlock when the failing IPC is SET_D0IX
  ASoC: codecs: hda: Fix RPM usage count underflow
  ASoC: amd: yc: Add support for Lenovo Yoga 7 16ARP8
  ASoC: tas571x: fix tas5733 num_controls
  ...
parents 5b032cac 10db9528

drivers/firmware/cirrus/test/cs_dsp_mock_wmfw.c

+2 −1
Original line number Diff line number Diff line
@@ -133,10 +133,11 @@ void cs_dsp_mock_wmfw_add_info(struct cs_dsp_mock_wmfw_builder *builder, 


	if (info_len % 4) {

		/* Create a padded string with length a multiple of 4 */

		size_t copy_len = info_len;

		info_len = round_up(info_len, 4);

		tmp = kunit_kzalloc(builder->test_priv->test, info_len, GFP_KERNEL);

		KUNIT_ASSERT_NOT_ERR_OR_NULL(builder->test_priv->test, tmp);

		memcpy(tmp, info, info_len);

		memcpy(tmp, info, copy_len);

		info = tmp;

	}

drivers/firmware/cirrus/test/cs_dsp_test_control_cache.c

+0 −1
Original line number Diff line number Diff line
@@ -776,7 +776,6 @@ static void cs_dsp_ctl_cache_init_multiple_offsets(struct kunit *test) 
					      "dummyalg", NULL);



	/* Create controls identical except for offset */

	def.length_bytes = 8;

	def.offset_dsp_words = 0;

	def.shortname = "CtlA";

	cs_dsp_mock_wmfw_add_coeff_desc(local->wmfw_builder, &def);

sound/pci/hda/cs35l41_hda.c

+1 −1
Original line number Diff line number Diff line
@@ -1603,7 +1603,7 @@ static const struct regmap_irq cs35l41_reg_irqs[] = { 
	CS35L41_REG_IRQ(IRQ1_STATUS1, AMP_SHORT_ERR),

};



static struct regmap_irq_chip cs35l41_regmap_irq_chip = {

static const struct regmap_irq_chip cs35l41_regmap_irq_chip = {

	.name = "cs35l41 IRQ1 Controller",

	.status_base = CS35L41_IRQ1_STATUS1,

	.mask_base = CS35L41_IRQ1_MASK1,

sound/pci/hda/hda_bind.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static void hda_codec_unsol_event(struct hdac_device *dev, unsigned int ev) 
	struct hda_codec *codec = container_of(dev, struct hda_codec, core);



	/* ignore unsol events during shutdown */

	if (codec->bus->shutdown)

	if (codec->card->shutdown || codec->bus->shutdown)

		return;



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

sound/pci/hda/hda_intel.c

+3 −0
Original line number Diff line number Diff line
@@ -2724,6 +2724,9 @@ static const struct pci_device_id azx_ids[] = { 
	{ PCI_VDEVICE(ATI, 0xab38),

	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |

	  AZX_DCAPS_PM_RUNTIME },

	{ PCI_VDEVICE(ATI, 0xab40),

	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |

	  AZX_DCAPS_PM_RUNTIME },

	/* GLENFLY */

	{ PCI_DEVICE(PCI_VENDOR_ID_GLENFLY, PCI_ANY_ID),

	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,