* [PATCH 1/2] ASoC: simple-card: fix the DAPM routes map parsing
@ 2014-01-07 1:13 Xiubo Li
2014-01-07 15:43 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Xiubo Li @ 2014-01-07 1:13 UTC (permalink / raw)
To: broonie, lgirdwood
Cc: kuninori.morimoto.gx, alsa-devel, linux-kernel, Xiubo Li
The simple-card's DAPM route maping is optional.
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
---
Resend this patch.
sound/soc/generic/simple-card.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index c0d92813..33c816c 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -138,10 +138,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;
--
1.8.4
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] ASoC: simple-card: fix the DAPM routes map parsing
2014-01-07 1:13 [PATCH 1/2] ASoC: simple-card: fix the DAPM routes map parsing Xiubo Li
@ 2014-01-07 15:43 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2014-01-07 15:43 UTC (permalink / raw)
To: Xiubo Li; +Cc: lgirdwood, kuninori.morimoto.gx, alsa-devel, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 132 bytes --]
On Tue, Jan 07, 2014 at 09:13:42AM +0800, Xiubo Li wrote:
> The simple-card's DAPM route maping is optional.
Applied both, thanks.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-07 15:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-07 1:13 [PATCH 1/2] ASoC: simple-card: fix the DAPM routes map parsing Xiubo Li
2014-01-07 15:43 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®