forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'asoc-omap' into for-3.7

Browse source
This commit is contained in:
Mark Brown 2012-09-05 20:05:11 +08:00
commit 75d8f2931a
647 changed files with 7170 additions and 5277 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sound/soc/davinci/davinci-mcasp.c
View file

@ -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);
}
}