diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-06-15 11:55:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-06-15 11:55:35 +0100 |
| commit | 67884e215bf24ad9c244cc8b9eb3c243e85385a1 (patch) | |
| tree | 1ad61f8de8e284f54dc09c51edc2ca1ae1664a41 /sound | |
| parent | 1a01eff1b2294dce56af1ae0b98f7d1be1327a76 (diff) | |
| parent | 5b61ea499727f22ebdaaeedb9801b12ed6eb59c7 (diff) | |
| download | linux-3.10-67884e215bf24ad9c244cc8b9eb3c243e85385a1.tar.gz linux-3.10-67884e215bf24ad9c244cc8b9eb3c243e85385a1.tar.bz2 linux-3.10-67884e215bf24ad9c244cc8b9eb3c243e85385a1.zip | |
Merge branch 'for-2.6.35' into for-2.6.36
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/davinci/davinci-mcasp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 79f0f4ad242..d3955096d87 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -612,7 +612,6 @@ static void davinci_hw_common_param(struct davinci_audio_dev *dev, int stream) NUMDMA_MASK); mcasp_mod_bits(dev->base + DAVINCI_MCASP_WFIFOCTL, ((dev->txnumevt * tx_ser) << 8), NUMEVT_MASK); - mcasp_set_bits(dev->base + DAVINCI_MCASP_WFIFOCTL, FIFO_ENABLE); } if (dev->rxnumevt && stream == SNDRV_PCM_STREAM_CAPTURE) { @@ -623,7 +622,6 @@ static void davinci_hw_common_param(struct davinci_audio_dev *dev, int stream) NUMDMA_MASK); mcasp_mod_bits(dev->base + DAVINCI_MCASP_RFIFOCTL, ((dev->rxnumevt * rx_ser) << 8), NUMEVT_MASK); - mcasp_set_bits(dev->base + DAVINCI_MCASP_RFIFOCTL, FIFO_ENABLE); } } |