1 files changed, 2 insertions, 6 deletions

diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index f5387d962f5d..89e8bce114af 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -379,8 +379,8 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai,
                 regs->xcr2      |= XFIG;
         }
         if (cpu_is_omap2430() || cpu_is_omap34xx()) {
-                regs->xccr = DXENDLY(1) | XDMAEN;
-                regs->rccr = RFULL_CYCLE | RDMAEN;
+                regs->xccr = DXENDLY(1) | XDMAEN | XDISABLE;
+                regs->rccr = RFULL_CYCLE | RDMAEN | RDISABLE;
         }
 
         switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
@@ -388,15 +388,11 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai,
                 /* 1-bit data delay */
                 regs->rcr2      |= RDATDLY(1);
                 regs->xcr2      |= XDATDLY(1);
-                regs->rccr      |= RFULL_CYCLE | RDMAEN | RDISABLE;
-                regs->xccr      |= (DXENDLY(1) | XDMAEN | XDISABLE);
                 break;
         case SND_SOC_DAIFMT_DSP_A:
                 /* 1-bit data delay */
                 regs->rcr2      |= RDATDLY(1);
                 regs->xcr2      |= XDATDLY(1);
-                regs->rccr      |= RFULL_CYCLE | RDMAEN | RDISABLE;
-                regs->xccr      |= (DXENDLY(1) | XDMAEN | XDISABLE);
                 /* Invert FS polarity configuration */
                 temp_fmt ^= SND_SOC_DAIFMT_NB_IF;
                 break;