summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-09-14 16:49:00 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-09-14 16:56:25 +0100
commit3eef08ba522775360cc59fe0a6b1bca6ecc8da4e (patch)
tree669364862ee879e01a972fc479d294c497fa3d95 /sound/soc/soc-dapm.c
parent33d7f77850476a8b8df50bd50221bc644dd44357 (diff)
downloadlinux-3eef08ba522775360cc59fe0a6b1bca6ecc8da4e.tar.bz2
ASoC: Fix display of stream name in DAPM debugfs
Also display streams all the time while we're here. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 0d8b08ef8731..f79711b9fa5b 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1131,9 +1131,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->connect)