diff options
| -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, | |||
| 1974 | w->active ? "active" : "inactive"); | 1974 | w->active ? "active" : "inactive"); |
| 1975 | 1975 | ||
| 1976 | list_for_each_entry(p, &w->sources, list_sink) { | 1976 | list_for_each_entry(p, &w->sources, list_sink) { |
| 1977 | if (p->connected && !p->connected(w, p->sink)) | 1977 | if (p->connected && !p->connected(w, p->source)) |
| 1978 | continue; | 1978 | continue; |
| 1979 | 1979 | ||
| 1980 | if (p->connect) | 1980 | if (p->connect) |
| @@ -3525,6 +3525,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, | |||
| 3525 | if (!w) { | 3525 | if (!w) { |
| 3526 | dev_err(dapm->dev, "ASoC: Failed to create %s widget\n", | 3526 | dev_err(dapm->dev, "ASoC: Failed to create %s widget\n", |
| 3527 | dai->driver->playback.stream_name); | 3527 | dai->driver->playback.stream_name); |
| 3528 | return -ENOMEM; | ||
| 3528 | } | 3529 | } |
| 3529 | 3530 | ||
| 3530 | w->priv = dai; | 3531 | w->priv = dai; |
| @@ -3543,6 +3544,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, | |||
| 3543 | if (!w) { | 3544 | if (!w) { |
| 3544 | dev_err(dapm->dev, "ASoC: Failed to create %s widget\n", | 3545 | dev_err(dapm->dev, "ASoC: Failed to create %s widget\n", |
| 3545 | dai->driver->capture.stream_name); | 3546 | dai->driver->capture.stream_name); |
| 3547 | return -ENOMEM; | ||
| 3546 | } | 3548 | } |
| 3547 | 3549 | ||
| 3548 | w->priv = dai; | 3550 | w->priv = dai; |
