Commit de7d83da authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v5.0-2' of... 

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

ASoC: Additional fixes for the next release

A couple of fixes for build bot issues in the STM32 SAI driver.
parents 5e3cdecf 6be0f96d

sound/soc/stm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

sound/soc/stm/stm32_sai_sub.c

+2 −3
Original line number Diff line number Diff line
@@ -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;