aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/generic/simple-card.c
diff options
context:
space:
mode:
authorXiubo Li <Li.Xiubo@freescale.com>2014-01-06 20:13:42 -0500
committerMark Brown <broonie@linaro.org>2014-01-07 10:43:13 -0500
commitf87a3e825cb0f7d4d51556ece147f1a6299ac1af (patch)
treec11cc908b42783f6e323b8393ce4af1950ddba26 /sound/soc/generic/simple-card.c
parente2a19ac6c5b27ac93fe744c0ff0823cde52c9cbb (diff)
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>
Diffstat (limited to 'sound/soc/generic/simple-card.c')
-rw-r--r--sound/soc/generic/simple-card.c8
1 files changed, 5 insertions, 3 deletions
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,
134 (SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK); 134 (SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK);
135 135
136 /* DAPM routes */ 136 /* DAPM routes */
137 ret = snd_soc_of_parse_audio_routing(&info->snd_card, 137 if (of_property_read_bool(node, "simple-audio-routing")) {
138 ret = snd_soc_of_parse_audio_routing(&info->snd_card,
138 "simple-audio-routing"); 139 "simple-audio-routing");
139 if (ret) 140 if (ret)
140 return ret; 141 return ret;
142 }
141 143
142 /* CPU sub-node */ 144 /* CPU sub-node */
143 ret = -EINVAL; 145 ret = -EINVAL;