From: Xiubo Li <Li.Xiubo@freescale.com>
Date: Tue, 7 Jan 2014 01:13:42 +0000 (+0800)
Subject: ASoC: simple-card: fix the DAPM routes map parsing
X-Git-Tag: v3.14-rc1~143^2~1^2^2^7~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f87a3e825cb0f7d4d51556ece147f1a6299ac1af;p=users%2Fwilly%2Fxarray.git

ASoC: simple-card: fix the DAPM routes map parsing

The simple-card's DAPM route maping is optional.

Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index d4402fb57253..eb95beb25d43 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -134,10 +134,12 @@ static int asoc_simple_card_parse_of(struct device_node *node,
 		(SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK);
 
 	/* DAPM routes */
-	ret = snd_soc_of_parse_audio_routing(&info->snd_card,
+	if (of_property_read_bool(node, "simple-audio-routing")) {
+		ret = snd_soc_of_parse_audio_routing(&info->snd_card,
 					"simple-audio-routing");
-	if (ret)
-		return ret;
+		if (ret)
+			return ret;
+	}
 
 	/* CPU sub-node */
 	ret = -EINVAL;