2 files changed, 14 insertions, 10 deletions

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 8cf3aad30864..e7ebeb717482 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -510,6 +510,7 @@ struct snd_soc_dapm_path {
         u32 connect:1;  /* source and sink widgets are connected */
         u32 walking:1;  /* path is in the process of being walked */
         u32 weak:1;     /* path ignored for power management */
+        u32 is_supply:1;        /* At least one of the connected widgets is a supply */
 
         int (*connected)(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink);
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 2cad5f77ec60..d89be153a9e0 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -821,9 +821,6 @@ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget,
 
         DAPM_UPDATE_STAT(widget, path_checks);
 
-        if (widget->is_supply)
-                return 0;
-
         if (widget->is_sink && widget->connected) {
                 widget->outputs = snd_soc_dapm_suspend_check(widget);
                 return widget->outputs;
@@ -832,7 +829,7 @@ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget,
         list_for_each_entry(path, &widget->sinks, list_source) {
                 DAPM_UPDATE_STAT(widget, neighbour_checks);
 
-                if (path->weak)
+                if (path->weak || path->is_supply)
                         continue;
 
                 if (path->walking)
@@ -882,9 +879,6 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget,
 
         DAPM_UPDATE_STAT(widget, path_checks);
 
-        if (widget->is_supply)
-                return 0;
-
         if (widget->is_source && widget->connected) {
                 widget->inputs = snd_soc_dapm_suspend_check(widget);
                 return widget->inputs;
@@ -893,7 +887,7 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget,
         list_for_each_entry(path, &widget->sources, list_sink) {
                 DAPM_UPDATE_STAT(widget, neighbour_checks);
 
-                if (path->weak)
+                if (path->weak || path->is_supply)
                         continue;
 
                 if (path->walking)
@@ -1691,8 +1685,14 @@ static ssize_t dapm_widget_power_read_file(struct file *file,
         if (!buf)
                 return -ENOMEM;
 
-        in = is_connected_input_ep(w, NULL);
-        out = is_connected_output_ep(w, NULL);
+        /* Supply widgets are not handled by is_connected_{input,output}_ep() */
+        if (w->is_supply) {
+                in = 0;
+                out = 0;
+        } else {
+                in = is_connected_input_ep(w, NULL);
+                out = is_connected_output_ep(w, NULL);
+        }
 
         ret = snprintf(buf, PAGE_SIZE, "%s: %s%s  in %d out %d",
                        w->name, w->power ? "On" : "Off",
@@ -2213,6 +2213,9 @@ static int snd_soc_dapm_add_path(struct snd_soc_dapm_context *dapm,
         INIT_LIST_HEAD(&path->list_source);
         INIT_LIST_HEAD(&path->list_sink);
 
+        if (wsource->is_supply || wsink->is_supply)
+                path->is_supply = 1;
+
         /* connect static paths */
         if (control == NULL) {
                 path->connect = 1;