1 files changed, 8 insertions, 2 deletions

diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 7ecf19dfb07c..c3eae1d8e077 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -383,14 +383,20 @@ static void mcasp_start_tx(struct davinci_audio_dev *dev)
 static void davinci_mcasp_start(struct davinci_audio_dev *dev, int stream)
 {
         if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                if (dev->txnumevt)      /* enable FIFO */
+                if (dev->txnumevt) {    /* enable FIFO */
+                        mcasp_clr_bits(dev->base + DAVINCI_MCASP_WFIFOCTL,
+                                                                FIFO_ENABLE);
                         mcasp_set_bits(dev->base + DAVINCI_MCASP_WFIFOCTL,
                                                                 FIFO_ENABLE);
+                }
                 mcasp_start_tx(dev);
         } else {
-                if (dev->rxnumevt)      /* enable FIFO */
+                if (dev->rxnumevt) {    /* enable FIFO */
+                        mcasp_clr_bits(dev->base + DAVINCI_MCASP_RFIFOCTL,
+                                                                FIFO_ENABLE);
                         mcasp_set_bits(dev->base + DAVINCI_MCASP_RFIFOCTL,
                                                                 FIFO_ENABLE);
+                }
                 mcasp_start_rx(dev);
         }
 }