summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorVishal Thanki <vishalthanki@gmail.com>2015-03-03 18:59:00 +0530
committerMark Brown <broonie@kernel.org>2015-03-03 14:25:16 +0000
commit31f3032c1a5504259f6fa8e0c7f8d2d3e2f5db48 (patch)
tree3d3a82320cb4c6506b42fc88a29ca3a730fdc5a7 /sound
parentc517d838eb7d07bbe9507871fab3931deccff539 (diff)
downloadlinux-31f3032c1a5504259f6fa8e0c7f8d2d3e2f5db48.tar.bz2
ASoC: simple-card: Add a NULL pointer check in asoc_simple_card_dai_link_of
Make sure devm_kzalloc() succeeds. Signed-off-by: Vishal Thanki <vishalthanki@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-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;