| From 17d3069ccf06970e2db3f7cbf4335f207524279e Mon Sep 17 00:00:00 2001 |
| From: Arnaud Pouliquen <arnaud.pouliquen@st.com> |
| Date: Fri, 5 Apr 2019 11:19:11 +0200 |
| Subject: ASoC: stm32: fix sai driver name initialisation |
| |
| From: Arnaud Pouliquen <arnaud.pouliquen@st.com> |
| |
| commit 17d3069ccf06970e2db3f7cbf4335f207524279e upstream. |
| |
| This patch fixes the sai driver structure overwriting which results in |
| a cpu dai name equal NULL. |
| |
| Fixes: 3e086ed ("ASoC: stm32: add SAI driver") |
| |
| Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@st.com> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/soc/stm/stm32_sai_sub.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/sound/soc/stm/stm32_sai_sub.c |
| +++ b/sound/soc/stm/stm32_sai_sub.c |
| @@ -1394,7 +1394,6 @@ static int stm32_sai_sub_dais_init(struc |
| if (!sai->cpu_dai_drv) |
| return -ENOMEM; |
| |
| - sai->cpu_dai_drv->name = dev_name(&pdev->dev); |
| if (STM_SAI_IS_PLAYBACK(sai)) { |
| memcpy(sai->cpu_dai_drv, &stm32_sai_playback_dai, |
| sizeof(stm32_sai_playback_dai)); |
| @@ -1404,6 +1403,7 @@ static int stm32_sai_sub_dais_init(struc |
| sizeof(stm32_sai_capture_dai)); |
| sai->cpu_dai_drv->capture.stream_name = sai->cpu_dai_drv->name; |
| } |
| + sai->cpu_dai_drv->name = dev_name(&pdev->dev); |
| |
| return 0; |
| } |
