diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-20 10:38:14 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-20 10:38:14 +0200 |
| commit | b2c420657f34e55aa0fc30ed4a3b553b100502c4 (patch) | |
| tree | ccf4117c6278b8e548f9dfb2810099b5dd462e09 /sound | |
| parent | eb6e70417bfef869324b8452f11ba7f300da4f81 (diff) | |
| parent | 5b61ea499727f22ebdaaeedb9801b12ed6eb59c7 (diff) | |
| download | linux-3.10-b2c420657f34e55aa0fc30ed4a3b553b100502c4.tar.gz linux-3.10-b2c420657f34e55aa0fc30ed4a3b553b100502c4.tar.bz2 linux-3.10-b2c420657f34e55aa0fc30ed4a3b553b100502c4.zip | |
Merge branch 'fix/asoc' into for-linus
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); } } |