diff options
| author | Mark Brown <broonie@kernel.org> | 2015-12-23 00:23:32 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-12-23 00:23:32 +0000 |
| commit | a93202fa7b450a2783feecc571dcd0fee55c91c4 (patch) | |
| tree | b72bba3a826552606a581850771f0f6f776a1566 /sound/soc/soc-dapm.c | |
| parent | 3b88210da3a6af69e8bc7a6237e72c6ef5a2ca45 (diff) | |
| parent | 61b0088b6a5b98608ce00c18a057b1f5bcb5f8b3 (diff) | |
| download | linux-a93202fa7b450a2783feecc571dcd0fee55c91c4.tar.gz linux-a93202fa7b450a2783feecc571dcd0fee55c91c4.tar.bz2 linux-a93202fa7b450a2783feecc571dcd0fee55c91c4.zip | |
Merge remote-tracking branch 'asoc/topic/pcm-list' into asoc-next
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 8130b63e7f14..5a2812fa8946 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3905,13 +3905,10 @@ static void soc_dapm_dai_stream_event(struct snd_soc_dai *dai, int stream, void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card) { - struct snd_soc_pcm_runtime *rtd = card->rtd; - int i; + struct snd_soc_pcm_runtime *rtd; /* for each BE DAI link... */ - for (i = 0; i < card->num_rtd; i++) { - rtd = &card->rtd[i]; - + list_for_each_entry(rtd, &card->rtd_list, list) { /* * dynamic FE links have no fixed DAI mapping. * CODEC<->CODEC links have no direct connection. |