Commit 2824ef9b authored by Mark Brown's avatar Mark Brown

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

parents 95d67c7f 31f3032c
...@@ -372,6 +372,11 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, ...@@ -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->cpu_dai_name) +
strlen(dai_link->codec_dai_name) + 2, strlen(dai_link->codec_dai_name) + 2,
GFP_KERNEL); GFP_KERNEL);
if (!name) {
ret = -ENOMEM;
goto dai_link_of_err;
}
sprintf(name, "%s-%s", dai_link->cpu_dai_name, sprintf(name, "%s-%s", dai_link->cpu_dai_name,
dai_link->codec_dai_name); dai_link->codec_dai_name);
dai_link->name = dai_link->stream_name = name; dai_link->name = dai_link->stream_name = name;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment