From: Mark Brown <broonie@kernel.org>
Date: Tue, 10 Feb 2026 19:23:02 +0000 (+0000)
Subject: ASoC: Merge up release
X-Git-Tag: v7.0-rc1~29^2~1^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f14c94d21f3ffcd6652217c2c74a26b6ba9ad741;p=thirdparty%2Fkernel%2Fstable.git

ASoC: Merge up release

We need to fix some commits that went into the final release.
---

f14c94d21f3ffcd6652217c2c74a26b6ba9ad741
diff --cc drivers/firmware/cirrus/test/cs_dsp_test_bin.c
index 99148ea22df3e,2c6486fa95758..66140caeebb5e
--- a/drivers/firmware/cirrus/test/cs_dsp_test_bin.c
+++ b/drivers/firmware/cirrus/test/cs_dsp_test_bin.c
@@@ -2229,10 -2226,25 +2231,25 @@@ static int cs_dsp_bin_test_common_init(
  		return ret;
  
  	/* Automatically call cs_dsp_remove() when test case ends */
- 	return kunit_add_action_or_reset(priv->test, _cs_dsp_remove_wrapper, dsp);
+ 	ret = kunit_add_action_or_reset(priv->test, _cs_dsp_remove_wrapper, dsp);
+ 	if (ret)
+ 		return ret;
+ 
+ 	/*
+ 	 * The large number of test cases will cause an unusually large amount
+ 	 * of dev_info() messages from cs_dsp, so suppress these.
+ 	 */
+ 	cs_dsp_suppress_info_messages = true;
+ 
+ 	return 0;
+ }
+ 
+ static void cs_dsp_bin_test_exit(struct kunit *test)
+ {
+ 	cs_dsp_suppress_info_messages = false;
  }
  
 -static int cs_dsp_bin_test_halo_init(struct kunit *test)
 +static int cs_dsp_bin_test_halo_init_common(struct kunit *test, int wmdr_ver)
  {
  	struct cs_dsp *dsp;