aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorAnders Roxell <anders.roxell@linaro.org>2013-11-25 13:14:58 +0100
committerAnders Roxell <anders.roxell@linaro.org>2013-11-25 13:14:58 +0100
commit4fcea1cf4c9da385a2fa90dc631ff453bbfdbcb1 (patch)
treedb2b279c1ef40e8170883efd1c0bd118d1803aec /sound/soc/soc-dapm.c
parentb153532021104be5cc1abc3b6b60c004739b31c7 (diff)
parent3729ed7c6aa8c5b9eee8f832e4a246b8fa1d56b5 (diff)
Merge tag 'v3.10.19' into linux-lnglinux-lng-v3.10.19-final
This is the 3.10.19 stable release
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 360638362e98..c2ecb4e01597 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1797,7 +1797,7 @@ static ssize_t dapm_widget_power_read_file(struct file *file,
w->active ? "active" : "inactive");
list_for_each_entry(p, &w->sources, list_sink) {
- if (p->connected && !p->connected(w, p->sink))
+ if (p->connected && !p->connected(w, p->source))
continue;
if (p->connect)