diff options
author | Vinod Koul <vinod.koul@intel.com> | 2015-11-20 12:15:20 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-11-20 14:22:37 -0500 |
commit | abd657b1278c9cbf42cdd9654352f082b37e2793 (patch) | |
tree | c72278f74096f61fcb75a9f29706aa7e391a6a95 /sound/soc/fsl | |
parent | 1a497983a5ae62b4970187183fb3b40e68515a24 (diff) |
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>
Diffstat (limited to 'sound/soc/fsl')
-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, | |||
417 | static int fsl_asoc_card_late_probe(struct snd_soc_card *card) | 417 | static int fsl_asoc_card_late_probe(struct snd_soc_card *card) |
418 | { | 418 | { |
419 | struct fsl_asoc_card_priv *priv = snd_soc_card_get_drvdata(card); | 419 | struct fsl_asoc_card_priv *priv = snd_soc_card_get_drvdata(card); |
420 | struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai; | 420 | struct snd_soc_pcm_runtime *rtd = list_first_entry( |
421 | &card->rtd_list, struct snd_soc_pcm_runtime, list); | ||
422 | struct snd_soc_dai *codec_dai = rtd->codec_dai; | ||
421 | struct codec_priv *codec_priv = &priv->codec_priv; | 423 | struct codec_priv *codec_priv = &priv->codec_priv; |
422 | struct device *dev = card->dev; | 424 | struct device *dev = card->dev; |
423 | int ret; | 425 | int ret; |
424 | 426 | ||
425 | if (fsl_asoc_card_is_ac97(priv)) { | 427 | if (fsl_asoc_card_is_ac97(priv)) { |
426 | #if IS_ENABLED(CONFIG_SND_AC97_CODEC) | 428 | #if IS_ENABLED(CONFIG_SND_AC97_CODEC) |
427 | struct snd_soc_codec *codec = card->rtd[0].codec; | 429 | struct snd_soc_codec *codec = rtd->codec; |
428 | struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec); | 430 | struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec); |
429 | 431 | ||
430 | /* | 432 | /* |