All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ASoC:kirkwood: Don't raise an error when no DAI format
@ 2014-09-28 14:19 Jean-Francois Moine
  0 siblings, 0 replies; 6+ messages in thread
From: Jean-Francois Moine @ 2014-09-28 14:19 UTC (permalink / raw)
  To: Mark Brown, Russell King - ARM Linux; +Cc: alsa-devel, linux-kernel

The two DAIs of the kirkwood controller have a unique PCM format.

The simple-card sets the audio hardware definitions of all CPU DAIs.
The PCM format is defined only when it is present in the DT.

This patch prevents the controller to raise an error when
the DT audio card definition by the simple card contains the PCM
format of one CPU DAI only.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
---
 sound/soc/kirkwood/kirkwood-i2s.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index 0704cd6..26d5f85 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -45,6 +45,8 @@ static int kirkwood_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
 	unsigned long value;
 
 	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+	case 0:
+		return 0;		/* already done (simple-card) */
 	case SND_SOC_DAIFMT_RIGHT_J:
 		mask = KIRKWOOD_I2S_CTL_RJ;
 		break;
-- 
2.1.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-10-01  8:59 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20140928150342.CC21B786A1D@smtpfb1-g21.free.fr>
2014-09-28 15:12 ` [PATCH] ASoC:kirkwood: Don't raise an error when no DAI format Russell King - ARM Linux
2014-09-28 16:05   ` Jean-Francois Moine
2014-09-30 18:19     ` Mark Brown
2014-10-01  8:59       ` Jean-Francois Moine
2014-10-01  8:59         ` Jean-Francois Moine
2014-09-28 14:19 Jean-Francois Moine

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.