From: Mark Brown <broonie@kernel.org>
Date: Wed, 23 Sep 2015 18:01:00 +0000 (-0700)
Subject: Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
X-Git-Tag: v4.3-rc3~17^2~1^2~4
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=5ee84ba8c7f5a5dd1934459acfec6108b5285940;hp=1f93e4a96c9109378204c147b3eec0d0e8100fde;p=linux-2.6-block.git

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

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index f4bf21a5539b..ff8bda471b25 100644
--- 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: