summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-09-23 11:01:00 -0700
committerMark Brown <broonie@kernel.org>2015-09-23 11:01:00 -0700
commit5ee84ba8c7f5a5dd1934459acfec6108b5285940 (patch)
tree603eacfec190939c5229452bb0facd454ffc4940 /sound
parent1f93e4a96c9109378204c147b3eec0d0e8100fde (diff)
parent75881df3fd7708f234c1e2573ade812eb5701708 (diff)
downloadlinux-5ee84ba8c7f5a5dd1934459acfec6108b5285940.tar.bz2
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-dapm.c2
1 files changed, 1 insertions, 1 deletions
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: