aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-core.c2
-rw-r--r--sound/soc/txx9/txx9aclc.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 0509d726759d..e20bb65a1634 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1309,7 +1309,6 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
1309{ 1309{
1310 struct snd_soc_dai_link *dai_link = &card->dai_link[num]; 1310 struct snd_soc_dai_link *dai_link = &card->dai_link[num];
1311 struct snd_soc_pcm_runtime *rtd = &card->rtd[num]; 1311 struct snd_soc_pcm_runtime *rtd = &card->rtd[num];
1312 struct snd_soc_platform *platform = rtd->platform;
1313 struct snd_soc_dai *cpu_dai = rtd->cpu_dai; 1312 struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
1314 int i, ret; 1313 int i, ret;
1315 1314
@@ -1317,7 +1316,6 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
1317 card->name, num, order); 1316 card->name, num, order);
1318 1317
1319 /* config components */ 1318 /* config components */
1320 cpu_dai->platform = platform;
1321 cpu_dai->card = card; 1319 cpu_dai->card = card;
1322 for (i = 0; i < rtd->num_codecs; i++) 1320 for (i = 0; i < rtd->num_codecs; i++)
1323 rtd->codec_dais[i]->card = card; 1321 rtd->codec_dais[i]->card = card;
diff --git a/sound/soc/txx9/txx9aclc.c b/sound/soc/txx9/txx9aclc.c
index cd71fd889d8b..00b7e2d02690 100644
--- a/sound/soc/txx9/txx9aclc.c
+++ b/sound/soc/txx9/txx9aclc.c
@@ -292,7 +292,7 @@ static int txx9aclc_pcm_new(struct snd_soc_pcm_runtime *rtd)
292 struct snd_card *card = rtd->card->snd_card; 292 struct snd_card *card = rtd->card->snd_card;
293 struct snd_soc_dai *dai = rtd->cpu_dai; 293 struct snd_soc_dai *dai = rtd->cpu_dai;
294 struct snd_pcm *pcm = rtd->pcm; 294 struct snd_pcm *pcm = rtd->pcm;
295 struct platform_device *pdev = to_platform_device(dai->platform->dev); 295 struct platform_device *pdev = to_platform_device(rtd->platform->dev);
296 struct txx9aclc_soc_device *dev; 296 struct txx9aclc_soc_device *dev;
297 struct resource *r; 297 struct resource *r;
298 int i; 298 int i;