hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

This commit is contained in:
Mark Brown 2013-08-15 11:37:53 +01:00
parent c200d88816 fe58139114
commit 14388a6934
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/soc-dapm.c
View File

@ -679,13 +679,14 @@ static int dapm_new_mux(struct snd_soc_dapm_widget *w)
return -EINVAL; return -EINVAL;
} }
path = list_first_entry(&w->sources, struct snd_soc_dapm_path, if (list_empty(&w->sources)) {
list_sink);
if (!path) {
dev_err(dapm->dev, "ASoC: mux %s has no paths\n", w->name); dev_err(dapm->dev, "ASoC: mux %s has no paths\n", w->name);
return -EINVAL; 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); ret = dapm_create_or_share_mixmux_kcontrol(w, 0, path);
if (ret < 0) if (ret < 0)
return ret; return ret;