From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 18 Sep 2009 14:09:44 +0000 (+0100)
Subject: Merge branch 'for-2.6.32' into for-2.6.33
X-Git-Tag: v2.6.33-rc1~390^2~1^2~110
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9f072b7b2260a588bfb5fb43418c3358104e7c13;p=karo-tx-linux.git

Merge branch 'for-2.6.32' into for-2.6.33
---

9f072b7b2260a588bfb5fb43418c3358104e7c13
diff --cc sound/soc/soc-dapm.c
index 37f7adeae323,f79711b9fa5b..9babda559c92
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@@ -1135,14 -1131,12 +1135,15 @@@ static ssize_t dapm_widget_power_read_f
  	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))
 +			continue;
 +
  		if (p->connect)
  			ret += snprintf(buf + ret, PAGE_SIZE - ret,
  					" in  %s %s\n",