commit 2824ef9b81b0d440ed63e87f67f01f5cc942457f
author Mark Brown <broonie@kernel.org> Wed Mar 04 20:42:43 2015 +0000
committer Mark Brown <broonie@kernel.org> Wed Mar 04 20:42:43 2015 +0000
tree 2e93d8255a13d21d13fdf79ea6ce4e4243f95cbf
parent 95d67c7fc2e5fa21befb1a07bc016748d9cd6192
parent 31f3032c1a5504259f6fa8e0c7f8d2d3e2f5db48

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

sound/soc/generic/simple-card.c

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index f7c6734..fb550b5 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -372,6 +372,11 @@
 			    strlen(dai_link->cpu_dai_name)   +
 			    strlen(dai_link->codec_dai_name) + 2,
 			    GFP_KERNEL);
+	if (!name) {
+		ret = -ENOMEM;
+		goto dai_link_of_err;
+	}
+
 	sprintf(name, "%s-%s", dai_link->cpu_dai_name,
 				dai_link->codec_dai_name);
 	dai_link->name = dai_link->stream_name = name;