Fix merge error in omap-mcbsp

[pandora-kernel.git] / sound / soc / omap / omap-mcbsp.c

diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 6c4f8bc..3cc4c0c 100644 (file)
--- 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;
        }