Browse Source

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

Mark Brown 12 years ago
parent
commit
14388a6934
1 changed files with 4 additions and 3 deletions
  1. 4 3
      sound/soc/soc-dapm.c

+ 4 - 3
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;