diff options
| author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-01-07 05:13:42 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-07 19:43:13 +0400 |
| commit | f87a3e825cb0f7d4d51556ece147f1a6299ac1af (patch) | |
| tree | c11cc908b42783f6e323b8393ce4af1950ddba26 /sound | |
| parent | e2a19ac6c5b27ac93fe744c0ff0823cde52c9cbb (diff) | |
| download | linux-f87a3e825cb0f7d4d51556ece147f1a6299ac1af.tar.xz | |
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')
| -rw-r--r-- | sound/soc/generic/simple-card.c | 8 |
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, (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; |