diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-10-23 20:07:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-10-23 20:07:07 +0200 |
| commit | de7d83da84bdf0b5ec50b3b09249e608c0e4b81d (patch) | |
| tree | 50df11e4cec58abd3a242ddce22df26bcae021a2 | |
| parent | 5e3cdecf7834a764b9d24f6e696adf3e03813fab (diff) | |
| parent | 6be0f96d799f487f05eb412d362d5a1747d665c2 (diff) | |
Merge tag 'asoc-v5.0-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linussound-4.20-rc1
ASoC: Additional fixes for the next release
A couple of fixes for build bot issues in the STM32 SAI driver.
| -rw-r--r-- | sound/soc/stm/Kconfig | 1 | ||||
| -rw-r--r-- | sound/soc/stm/stm32_sai_sub.c | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/stm/Kconfig b/sound/soc/stm/Kconfig index 9b2681397dba..c66ffa72057e 100644 --- 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 31d22abd3204..ea05cc91aa05 100644 --- 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; |