summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-03-04 20:42:43 +0000
committerMark Brown <broonie@kernel.org>2015-03-04 20:42:43 +0000
commit2824ef9b81b0d440ed63e87f67f01f5cc942457f (patch)
tree2e93d8255a13d21d13fdf79ea6ce4e4243f95cbf /sound/soc
parent95d67c7fc2e5fa21befb1a07bc016748d9cd6192 (diff)
parent31f3032c1a5504259f6fa8e0c7f8d2d3e2f5db48 (diff)
downloadblackbird-op-linux-2824ef9b81b0d440ed63e87f67f01f5cc942457f.tar.gz
blackbird-op-linux-2824ef9b81b0d440ed63e87f67f01f5cc942457f.zip
Merge remote-tracking branch 'asoc/fix/simple' into asoc-linus
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/generic/simple-card.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index f7c6734bd5da..fb550b5869d2 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -372,6 +372,11 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
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;
OpenPOWER on IntegriCloud