diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-15 11:37:53 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-15 11:37:53 +0100 |
| commit | 14388a69348d14fb8fb02a2cbd0512af8902e912 (patch) | |
| tree | ebce31fb5aebf7373f47725f8a8ae00de8fef0ff /sound | |
| parent | c200d8881634a390bcb6ef4e23aa5d9a08d41efa (diff) | |
| parent | fe581391147cb3d738d961d0f1233d91a9e1113c (diff) | |
| download | linux-14388a69348d14fb8fb02a2cbd0512af8902e912.tar.gz linux-14388a69348d14fb8fb02a2cbd0512af8902e912.tar.bz2 linux-14388a69348d14fb8fb02a2cbd0512af8902e912.zip | |
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-dapm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index bd16010441cc..4375c9f2b791 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -679,13 +679,14 @@ static int dapm_new_mux(struct snd_soc_dapm_widget *w) return -EINVAL; } - path = list_first_entry(&w->sources, struct snd_soc_dapm_path, - list_sink); - if (!path) { + if (list_empty(&w->sources)) { dev_err(dapm->dev, "ASoC: mux %s has no paths\n", w->name); return -EINVAL; } + path = list_first_entry(&w->sources, struct snd_soc_dapm_path, + list_sink); + ret = dapm_create_or_share_mixmux_kcontrol(w, 0, path); if (ret < 0) return ret; |