diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-03 22:04:12 -0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-03 22:04:12 -0800 |
| commit | 41caa416341528d104294daa95244cc1eeb754ff (patch) | |
| tree | cc3d5a45d49e6a3403e3d284903debe7f783541e /sound | |
| parent | ca89bc248e2fac44d6374a48b8d38b068c7a1bdf (diff) | |
| parent | 298402a3858e17e6a78acafa1dcd490167dd9f74 (diff) | |
| download | linux-41caa416341528d104294daa95244cc1eeb754ff.tar.bz2 | |
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-dapm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 2fb0b72d8a3c..cc36caaf6443 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1974,7 +1974,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) @@ -3525,6 +3525,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, if (!w) { dev_err(dapm->dev, "ASoC: Failed to create %s widget\n", dai->driver->playback.stream_name); + return -ENOMEM; } w->priv = dai; @@ -3543,6 +3544,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, if (!w) { dev_err(dapm->dev, "ASoC: Failed to create %s widget\n", dai->driver->capture.stream_name); + return -ENOMEM; } w->priv = dai; |