diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-25 13:02:35 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-25 13:02:35 +0200 |
| commit | 2fc565e4eaf8fc633bfc741b90e1f28dba732ee1 (patch) | |
| tree | 98c994692f84aee07cf1c7b4cda245ae5235a94d /sound/soc/davinci/davinci-pcm.c | |
| parent | 7fc7d047216aa4923d401c637be2ebc6e3d5bd9b (diff) | |
| parent | 5cc50fc858a5ab37dc2744d72d7ffed96f23afd8 (diff) | |
| download | linux-2fc565e4eaf8fc633bfc741b90e1f28dba732ee1.tar.gz | |
Merge tag 'asoc-v3.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.10 A few more fixes, nothing too major though the DMA changes fix modular builds.
Diffstat (limited to 'sound/soc/davinci/davinci-pcm.c')
| -rw-r--r-- | sound/soc/davinci/davinci-pcm.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c index 078031d61167..b2f27c2e5fdc 100644 --- a/sound/soc/davinci/davinci-pcm.c +++ b/sound/soc/davinci/davinci-pcm.c @@ -181,7 +181,6 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream) unsigned short acnt; unsigned int count; unsigned int fifo_level; - unsigned char serializers = prtd->params->active_serializers; period_size = snd_pcm_lib_period_bytes(substream); dma_offset = prtd->period * period_size; @@ -195,14 +194,14 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream) data_type = prtd->params->data_type; count = period_size / data_type; if (fifo_level) - count /= fifo_level * serializers; + count /= fifo_level; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { src = dma_pos; dst = prtd->params->dma_addr; src_bidx = data_type; dst_bidx = 4; - src_cidx = data_type * fifo_level * serializers; + src_cidx = data_type * fifo_level; dst_cidx = 0; } else { src = prtd->params->dma_addr; @@ -210,7 +209,7 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream) src_bidx = 0; dst_bidx = data_type; src_cidx = 0; - dst_cidx = data_type * fifo_level * serializers; + dst_cidx = data_type * fifo_level; } acnt = prtd->params->acnt; @@ -225,8 +224,8 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream) ASYNC); else edma_set_transfer_params(prtd->asp_link[0], acnt, - fifo_level * serializers, - count, fifo_level * serializers, + fifo_level, + count, fifo_level, ABSYNC); } |