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

5ee84ba8 · Mark Brown · 1f93e4a9 · 75881df3 · 5ee84ba8
Commit 5ee84ba8 authored Sep 23, 2015 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/soc-dapm.c sound/soc/soc-dapm.c +1 -1

No files found.
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3501,7 +3501,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
 	default:
 		WARN(1, "Unknown event %d\n", event);
-		return -EINVAL;
+		ret = -EINVAL;
 	}
 out: