Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4f1e3ef authored by Arnaud Pouliquen's avatar Arnaud Pouliquen Committed by Greg Kroah-Hartman
Browse files

ASoC: stm32: fix sai driver name initialisation 



commit 17d3069ccf06970e2db3f7cbf4335f207524279e upstream.

This patch fixes the sai driver structure overwriting which results in
a cpu dai name equal NULL.

Fixes: 3e086edf ("ASoC: stm32: add SAI driver")

Signed-off-by: default avatarArnaud Pouliquen <arnaud.pouliquen@st.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7d3f7107

sound/soc/stm/stm32_sai_sub.c

+1 −1
Original line number Diff line number Diff line
@@ -1194,7 +1194,6 @@ static int stm32_sai_sub_dais_init(struct platform_device *pdev, 
	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));
@@ -1204,6 +1203,7 @@ static int stm32_sai_sub_dais_init(struct platform_device *pdev, 
		       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;

}