From bd5031623c51905b757b3ede43d8a639fda2d7e9 Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Mon, 8 Dec 2008 23:54:33 +0200 Subject: [PATCH] Fix merge error in omap-mcbsp --- sound/soc/omap/omap-mcbsp.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 6c4f8bc6f0bb..3cc4c0c371b1 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -301,12 +301,17 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai, switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { case SND_SOC_DAIFMT_I2S: - /* 0-bit data delay */ - regs->rcr2 |= RDATDLY(0); - regs->xcr2 |= XDATDLY(0); - break; - default: - /* Unsupported data format */ + /* 1-bit data delay */ + regs->rcr2 |= RDATDLY(1); + regs->xcr2 |= XDATDLY(1); + break; + case SND_SOC_DAIFMT_DSP_A: + /* 0-bit data delay */ + regs->rcr2 |= RDATDLY(0); + regs->xcr2 |= XDATDLY(0); + break; + default: + /* Unsupported data format */ return -EINVAL; } -- 2.39.2