diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-09-17 21:08:53 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-09-17 21:08:53 +0200 |
| commit | 673bca1906334972c2b54e7c7c002941329039cd (patch) | |
| tree | 255d7e793cf75d6ebcd52f8c8fc6683bae398cf6 /sound/soc/soc-dapm.c | |
| parent | 1110afbe728838ac7ce973c37af9e11385dbaef9 (diff) | |
| parent | d4e54e871f4d2ca29df081abf8e0d5209d252979 (diff) | |
| download | lwn-673bca1906334972c2b54e7c7c002941329039cd.tar.gz lwn-673bca1906334972c2b54e7c7c002941329039cd.zip | |
Merge branch 'fix/asoc' into for-linus
* fix/asoc:
ASoC: remove unused #include <linux/version.h>
ASoC: S3C lrsync function made to work with IRQs disabled.
ASoC: Fix display of stream name in DAPM debugfs
ASoC: Clean up error handling in MPC5200 DMA setup
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 7 |
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) |