Merge remote-tracking branch 'asoc/fix/dapm' into asoc-next

diff --combined sound/soc/soc-dapm.c
index 1d6a9b3,ab621b1..d6d9ba2
--- 1/sound/soc/soc-dapm.c
--- 2/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@@ -831,6 -831,9 +831,9 @@@ static int is_connected_output_ep(struc
                if (path->weak)
                        continue;
  
+               if (path->walking)
+                       return 1;
+ 
                if (path->walked)
                        continue;
  
@@@ -838,6 -841,7 +841,7 @@@
  
                if (path->sink && path->connect) {
                        path->walked = 1;
+                       path->walking = 1;
  
                        /* do we need to add this widget to the list ? */
                        if (list) {
@@@ -847,11 -851,14 +851,14 @@@
                                        dev_err(widget->dapm->dev,
                                                "ASoC: could not add widget %s\n",
                                                widget->name);
+                                       path->walking = 0;
                                        return con;
                                }
                        }
  
                        con += is_connected_output_ep(path->sink, list);
+ 
+                       path->walking = 0;
                }
        }
  
@@@ -931,6 -938,9 +938,9 @@@ static int is_connected_input_ep(struc
                if (path->weak)
                        continue;
  
+               if (path->walking)
+                       return 1;
+ 
                if (path->walked)
                        continue;
  
@@@ -938,6 -948,7 +948,7 @@@
  
                if (path->source && path->connect) {
                        path->walked = 1;
+                       path->walking = 1;
  
                        /* do we need to add this widget to the list ? */
                        if (list) {
@@@ -947,11 -958,14 +958,14 @@@
                                        dev_err(widget->dapm->dev,
                                                "ASoC: could not add widget %s\n",
                                                widget->name);
+                                       path->walking = 0;
                                        return con;
                                }
                        }
  
                        con += is_connected_input_ep(path->source, list);
+ 
+                       path->walking = 0;
                }
        }
  
@@@ -3255,16 -3269,14 +3269,16 @@@ static int snd_soc_dai_link_event(struc
                break;
  
        case SND_SOC_DAPM_POST_PMU:
 -              ret = snd_soc_dai_digital_mute(sink, 0);
 +              ret = snd_soc_dai_digital_mute(sink, 0,
 +                                             SNDRV_PCM_STREAM_PLAYBACK);
                if (ret != 0 && ret != -ENOTSUPP)
                        dev_warn(sink->dev, "ASoC: Failed to unmute: %d\n", ret);
                ret = 0;
                break;
  
        case SND_SOC_DAPM_PRE_PMD:
 -              ret = snd_soc_dai_digital_mute(sink, 1);
 +              ret = snd_soc_dai_digital_mute(sink, 1,
 +                                             SNDRV_PCM_STREAM_PLAYBACK);
                if (ret != 0 && ret != -ENOTSUPP)
                        dev_warn(sink->dev, "ASoC: Failed to mute: %d\n", ret);
                ret = 0;