Merge branch 'for-2.6.32' into for-2.6.33

1 files changed, 4 insertions, 3 deletions

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 37f7adeae323..9babda559c92 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1135,9 +1135,10 @@ static ssize_t dapm_widget_power_read_file(struct file *file,
         ret = snprintf(buf, PAGE_SIZE, "%s: %s  in %d out %d\n",
                        w->name, w->power ? "On" : "Off", in, out);
 
-        if (w->active && w->sname)
-                ret += snprintf(buf, PAGE_SIZE - ret, " stream %s active\n",
-                                w->sname);
+        if (w->sname)
+                ret += snprintf(buf + ret, PAGE_SIZE - ret, " stream %s %s\n",
+                                w->sname,
+                                w->active ? "active" : "inactive");
 
         list_for_each_entry(p, &w->sources, list_sink) {
                 if (p->connected && !p->connected(w, p->sink))