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

Commit 2aeceaaf authored by Olivier Moysan's avatar Olivier Moysan Committed by Greg Kroah-Hartman
Browse files

ASoC: stm32: sai: fix iec958 controls indexation 



[ Upstream commit 5f8a1000c3e630c3ac06f1d664eeaa755bce8823 ]

Allow indexation of sai iec958 controls according
to device id.

Signed-off-by: default avatarOlivier Moysan <olivier.moysan@st.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6544b496

sound/soc/stm/stm32_sai_sub.c

+4 −3
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ 
 * @slot_mask: rx or tx active slots mask. set at init or at runtime

 * @data_size: PCM data width. corresponds to PCM substream width.

 * @spdif_frm_cnt: S/PDIF playback frame counter

 * @snd_aes_iec958: iec958 data

 * @iec958: iec958 data

 * @ctrl_lock: control lock

 */

struct stm32_sai_sub_data {
@@ -888,11 +888,12 @@ static int stm32_sai_pcm_new(struct snd_soc_pcm_runtime *rtd, 
			     struct snd_soc_dai *cpu_dai)

{

	struct stm32_sai_sub_data *sai = dev_get_drvdata(cpu_dai->dev);

	struct snd_kcontrol_new knew = iec958_ctls;



	if (STM_SAI_PROTOCOL_IS_SPDIF(sai)) {

		dev_dbg(&sai->pdev->dev, "%s: register iec controls", __func__);

		return snd_ctl_add(rtd->pcm->card,

				   snd_ctl_new1(&iec958_ctls, sai));

		knew.device = rtd->pcm->device;

		return snd_ctl_add(rtd->pcm->card, snd_ctl_new1(&knew, sai));

	}



	return 0;