summaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl/fsl-asoc-card.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-01-11 13:54:28 +0000
committerMark Brown <broonie@kernel.org>2016-01-11 13:54:28 +0000
commit7b2f32cc81e14149e2fe515f69f35f9e11e8ba5a (patch)
treedac5980859c5af6566c7f9be2a12c7b68651eea9 /sound/soc/fsl/fsl-asoc-card.c
parentb7f08d29c9ef76fb4bc95385e3f90b51e0494a3b (diff)
parentfe09dd8eb2310ec658f49a5431df2259f11cbe9e (diff)
downloadlinux-7b2f32cc81e14149e2fe515f69f35f9e11e8ba5a.tar.bz2
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'sound/soc/fsl/fsl-asoc-card.c')
-rw-r--r--sound/soc/fsl/fsl-asoc-card.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
index 1b05d1c5d9fd..f4b6c53146d5 100644
--- a/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@ -222,12 +222,15 @@ static int fsl_asoc_card_set_bias_level(struct snd_soc_card *card,
enum snd_soc_bias_level level)
{
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;
+ struct snd_soc_dai *codec_dai;
struct codec_priv *codec_priv = &priv->codec_priv;
struct device *dev = card->dev;
unsigned int pll_out;
int ret;
+ rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name);
+ codec_dai = rtd->codec_dai;
if (dapm->dev != codec_dai->dev)
return 0;