Merge remote-tracking branches 'asoc/topic/pxa', 'asoc/topic/qcom', 'asoc/topic/rcar...

[mirror_ubuntu-artful-kernel.git] / sound / soc / sh / rcar / rsrc-card.c

diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c
index 5fe0b51cdb4472f43ffc54a7de24bdacf196a74c..8a357fdf1077c91822d6699dcf79e7aa96574809 100644 (file)
--- a/sound/soc/sh/rcar/rsrc-card.c
+++ b/sound/soc/sh/rcar/rsrc-card.c
@@ -78,7 +78,7 @@ static int rsrc_card_startup(struct snd_pcm_substream *substream)
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        struct rsrc_card_priv *priv =   snd_soc_card_get_drvdata(rtd->card);
        struct rsrc_card_dai *dai_props =
-               rsrc_priv_to_props(priv, rtd - rtd->card->rtd);
+               rsrc_priv_to_props(priv, rtd->num);
 
        return clk_prepare_enable(dai_props->clk);
 }
@@ -88,7 +88,7 @@ static void rsrc_card_shutdown(struct snd_pcm_substream *substream)
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        struct rsrc_card_priv *priv =   snd_soc_card_get_drvdata(rtd->card);
        struct rsrc_card_dai *dai_props =
-               rsrc_priv_to_props(priv, rtd - rtd->card->rtd);
+               rsrc_priv_to_props(priv, rtd->num);
 
        clk_disable_unprepare(dai_props->clk);
 }
@@ -104,7 +104,7 @@ static int rsrc_card_dai_init(struct snd_soc_pcm_runtime *rtd)
        struct snd_soc_dai *dai;
        struct snd_soc_dai_link *dai_link;
        struct rsrc_card_dai *dai_props;
-       int num = rtd - rtd->card->rtd;
+       int num = rtd->num;
        int ret;
 
        dai_link        = rsrc_priv_to_link(priv, num);