Merge branch 'topic/sink' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --combined sound/soc/soc-dapm.c
index 3eba72c6f9dd277bbc55271abcca09849559f88a,6760044f6aae8e9d3f19cc41d35b44110b3f7e52..506677b12787444029215df5fbdaa7017937fdb1
--- 1/sound/soc/soc-dapm.c
--- 2/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@@ -3351,6 -3351,11 +3351,11 @@@ snd_soc_dapm_new_control_unlocked(struc
                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:
@@@ -3893,10 -3898,13 +3898,10 @@@ static void soc_dapm_dai_stream_event(s
  
  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.