summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2025-05-23 20:45:16 +0200
committerTakashi Iwai <tiwai@suse.de>2025-05-23 20:45:16 +0200
commit534e9cf3782f1bd6adf0bd7d17ff414ea12a6bf2 (patch)
treef30a4dc12f53f9549f196d7176f80e50e1ac1fa0 /drivers
parentaca89f1be6bd3196dedc368e257351c1e561082e (diff)
parent43a38a0ff8c63ee156d997cd13063c63cd55d812 (diff)
downloadlinux-next-534e9cf3782f1bd6adf0bd7d17ff414ea12a6bf2.tar.gz
linux-next-534e9cf3782f1bd6adf0bd7d17ff414ea12a6bf2.zip
Merge tag 'asoc-v6.16-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Additional v6.16 updates A couple more updates on top of the last set I sent you, a new driver for the ES8375 and a fix for the Cirrus KUnit tests from Jaroslav.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/firmware/cirrus/test/cs_dsp_mock_bin.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/firmware/cirrus/test/cs_dsp_mock_bin.c b/drivers/firmware/cirrus/test/cs_dsp_mock_bin.c
index 80e67474ddb8..3f8777ee4dc0 100644
--- a/drivers/firmware/cirrus/test/cs_dsp_mock_bin.c
+++ b/drivers/firmware/cirrus/test/cs_dsp_mock_bin.c
@@ -96,10 +96,11 @@ static void cs_dsp_mock_bin_add_name_or_info(struct cs_dsp_mock_bin_builder *bui
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;
}