diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-06 14:04:16 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-06 14:04:16 +0100 |
| commit | 303076342b8a30aa98f8a53b539155d0b81ff0c3 (patch) | |
| tree | 09197f8d7409d2ccd4a98ea6052634fc9f3a7757 /sound/soc/soc-dapm.c | |
| parent | 650d6e25cde82fda425995ba77ed4b0ad3be5b8d (diff) | |
| parent | 9d5ef2663fe220a88412a7190942b7d933da0333 (diff) | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into topic/asoc
A few more ASoC updates, the main one is the move of the audmux driver
from arch/arm into sound/soc. There's also some general driver specific
tweaks and fixes.
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index c9b088dab1cf..a4d4aa1e6c49 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1569,8 +1569,9 @@ static ssize_t dapm_widget_power_read_file(struct file *file, out = is_connected_output_ep(w); dapm_clear_walk(w->dapm); - ret = snprintf(buf, PAGE_SIZE, "%s: %s in %d out %d", - w->name, w->power ? "On" : "Off", in, out); + ret = snprintf(buf, PAGE_SIZE, "%s: %s%s in %d out %d", + w->name, w->power ? "On" : "Off", + w->force ? " (forced)" : "", in, out); if (w->reg >= 0) ret += snprintf(buf + ret, PAGE_SIZE - ret, |