Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[linux-2.6-block.git] / sound / soc / soc-dapm.c

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 7d009428934acab676ca34a1d17dfa4e1af83f25..a8156b54271b88c5dd84ce96d7f043dc7270b4d6 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3358,6 +3358,11 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,
                w->is_ep = SND_SOC_DAPM_EP_SOURCE;
                w->power_check = dapm_always_on_check_power;
                break;
+       case snd_soc_dapm_sink:
+               w->is_ep = SND_SOC_DAPM_EP_SINK;
+               w->power_check = dapm_always_on_check_power;
+               break;
+
        case snd_soc_dapm_mux:
        case snd_soc_dapm_demux:
        case snd_soc_dapm_switch:
@@ -3900,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.