diff options
| author | Vinod Koul | 2015-11-20 18:15:20 +0100 |
|---|---|---|
| committer | Mark Brown | 2015-11-20 20:22:37 +0100 |
| commit | abd657b1278c9cbf42cdd9654352f082b37e2793 (patch) | |
| tree | c72278f74096f61fcb75a9f29706aa7e391a6a95 | |
| parent | ASoC: Change the PCM runtime array to a list (diff) | |
| download | kernel-qcow2-linux-abd657b1278c9cbf42cdd9654352f082b37e2793.tar.gz kernel-qcow2-linux-abd657b1278c9cbf42cdd9654352f082b37e2793.tar.xz kernel-qcow2-linux-abd657b1278c9cbf42cdd9654352f082b37e2793.zip | |
ASoC: fsl-asoc-card: Update the rtd query
sound card rtd was an array and was updated to a list so update
the driver to use a list
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/fsl/fsl-asoc-card.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index f4b6c53146d5..c63d89da51f1 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -417,14 +417,16 @@ static int fsl_asoc_card_audmux_init(struct device_node *np, static int fsl_asoc_card_late_probe(struct snd_soc_card *card) { struct fsl_asoc_card_priv *priv = snd_soc_card_get_drvdata(card); - struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai; + struct snd_soc_pcm_runtime *rtd = list_first_entry( + &card->rtd_list, struct snd_soc_pcm_runtime, list); + struct snd_soc_dai *codec_dai = rtd->codec_dai; struct codec_priv *codec_priv = &priv->codec_priv; struct device *dev = card->dev; int ret; if (fsl_asoc_card_is_ac97(priv)) { #if IS_ENABLED(CONFIG_SND_AC97_CODEC) - struct snd_soc_codec *codec = card->rtd[0].codec; + struct snd_soc_codec *codec = rtd->codec; struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec); /* |