Merge tag 'asoc-v5.0-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

ASoC: Additional fixes for the next release

A couple of fixes for build bot issues in the STM32 SAI driver.

diff --git a/sound/soc/stm/Kconfig b/sound/soc/stm/Kconfig
index 9b2681397dba72edfb283469c1a181961068f85c..c66ffa72057e2db984280c45dae4007928b48bbb 100644 (file)
--- a/sound/soc/stm/Kconfig
+++ b/sound/soc/stm/Kconfig
@@ -3,6 +3,7 @@ menu "STMicroelectronics STM32 SOC audio support"
 config SND_SOC_STM32_SAI
        tristate "STM32 SAI interface (Serial Audio Interface) support"
        depends on (ARCH_STM32 && OF) || COMPILE_TEST
+       depends on COMMON_CLK
        depends on SND_SOC
        select SND_SOC_GENERIC_DMAENGINE_PCM
        select REGMAP_MMIO

diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c
index 31d22abd320426c6e4e3c6cf8d08887334a2bacf..ea05cc91aa05d8d14a402769928cb9119a8c9147 100644 (file)
--- a/sound/soc/stm/stm32_sai_sub.c
+++ b/sound/soc/stm/stm32_sai_sub.c
@@ -404,12 +404,11 @@ static int stm32_sai_add_mclk_provider(struct stm32_sai_sub_data *sai)
         * String after "_" char is stripped in parent name.
         */
        p = mclk_name;
-       while (*s && *s != '_' && (i < (SAI_MCLK_NAME_LEN - 6))) {
+       while (*s && *s != '_' && (i < (SAI_MCLK_NAME_LEN - 7))) {
                *p++ = *s++;
                i++;
        }
-       STM_SAI_IS_SUB_A(sai) ?
-               strncat(p, "a_mclk", 6) : strncat(p, "b_mclk", 6);
+       STM_SAI_IS_SUB_A(sai) ? strcat(p, "a_mclk") : strcat(p, "b_mclk");
 
        mclk->hw.init = CLK_HW_INIT(mclk_name, pname, &mclk_ops, 0);
        mclk->sai_data = sai;