]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: rsnd: rsrc-card: check return value of snd_soc_of_get_dai_name()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 1 Dec 2015 08:33:23 +0000 (08:33 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 1 Dec 2015 13:19:06 +0000 (13:19 +0000)
This patch adds missing check of snd_soc_of_get_dai_name().
It might not be able to use sound card, because it might returns
-EPROBE_DEFER.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sh/rcar/rsrc-card.c

index d61db9c385eafd3bc6fca47edad10bff696b3ba2..a3ec13f6271eccdb965c49e167097aac2b83a062 100644 (file)
@@ -208,7 +208,9 @@ static int rsrc_card_parse_links(struct device_node *np,
                dai_link->dynamic               = 1;
                dai_link->dpcm_merged_format    = 1;
                dai_link->cpu_of_node           = args.np;
-               snd_soc_of_get_dai_name(np, &dai_link->cpu_dai_name);
+               ret = snd_soc_of_get_dai_name(np, &dai_link->cpu_dai_name);
+               if (ret < 0)
+                       return ret;
 
                /* set dai_name */
                snprintf(dai_props->dai_name, DAI_NAME_NUM, "fe.%s",
@@ -240,7 +242,9 @@ static int rsrc_card_parse_links(struct device_node *np,
                dai_link->no_pcm                = 1;
                dai_link->be_hw_params_fixup    = rsrc_card_be_hw_params_fixup;
                dai_link->codec_of_node         = args.np;
-               snd_soc_of_get_dai_name(np, &dai_link->codec_dai_name);
+               ret = snd_soc_of_get_dai_name(np, &dai_link->codec_dai_name);
+               if (ret < 0)
+                       return ret;
 
                /* additional name prefix */
                if (of_data) {