1 files changed, 5 insertions, 7 deletions

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 54c33204541f..1ded8811598e 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -45,7 +45,7 @@ static int asoc_simple_card_startup(struct snd_pcm_substream *substream)
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
         struct simple_dai_props *dai_props =
-                &priv->dai_props[rtd - rtd->card->rtd];
+                &priv->dai_props[rtd->num];
         int ret;
 
         ret = clk_prepare_enable(dai_props->cpu_dai.clk);
@@ -64,7 +64,7 @@ static void asoc_simple_card_shutdown(struct snd_pcm_substream *substream)
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
         struct simple_dai_props *dai_props =
-                &priv->dai_props[rtd - rtd->card->rtd];
+                &priv->dai_props[rtd->num];
 
         clk_disable_unprepare(dai_props->cpu_dai.clk);
 
@@ -78,8 +78,7 @@ static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream,
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
-        struct simple_dai_props *dai_props =
-                &priv->dai_props[rtd - rtd->card->rtd];
+        struct simple_dai_props *dai_props = &priv->dai_props[rtd->num];
         unsigned int mclk, mclk_fs = 0;
         int ret = 0;
 
@@ -174,10 +173,9 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
         struct snd_soc_dai *codec = rtd->codec_dai;
         struct snd_soc_dai *cpu = rtd->cpu_dai;
         struct simple_dai_props *dai_props;
-        int num, ret;
+        int ret;
 
-        num = rtd - rtd->card->rtd;
-        dai_props = &priv->dai_props[num];
+        dai_props = &priv->dai_props[rtd->num];
         ret = __asoc_simple_card_dai_init(codec, &dai_props->codec_dai);
         if (ret < 0)
                 return ret;