diff options
| author | Olivier Moysan <olivier.moysan@st.com> | 2019-02-28 14:19:21 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-10 17:54:05 +0200 |
| commit | 2aeceaaff09b2fb329976ba67889d9a5c5bcc750 (patch) | |
| tree | bf686b223d47e20ba3f1fbad39de87fcb34b6a01 /sound | |
| parent | 6544b49661938b2fed436109c15700caa9b5e06d (diff) | |
| download | linux-stable-2aeceaaff09b2fb329976ba67889d9a5c5bcc750.tar.gz linux-stable-2aeceaaff09b2fb329976ba67889d9a5c5bcc750.tar.bz2 linux-stable-2aeceaaff09b2fb329976ba67889d9a5c5bcc750.zip | |
ASoC: stm32: sai: fix iec958 controls indexation
[ Upstream commit 5f8a1000c3e630c3ac06f1d664eeaa755bce8823 ]
Allow indexation of sai iec958 controls according
to device id.
Signed-off-by: Olivier Moysan <olivier.moysan@st.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/stm/stm32_sai_sub.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index 85c4b6d8e89d..e8df3cc341b5 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -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; |