diff options
Diffstat (limited to 'sound/soc/davinci/davinci-pcm.c')
-rw-r--r-- | sound/soc/davinci/davinci-pcm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c index 2dc406f42fe7..a7124116d2e0 100644 --- a/sound/soc/davinci/davinci-pcm.c +++ b/sound/soc/davinci/davinci-pcm.c | |||
@@ -381,7 +381,7 @@ static int request_ping_pong(struct snd_pcm_substream *substream, | |||
381 | /* Request ram master channel */ | 381 | /* Request ram master channel */ |
382 | link = prtd->ram_channel = edma_alloc_channel(EDMA_CHANNEL_ANY, | 382 | link = prtd->ram_channel = edma_alloc_channel(EDMA_CHANNEL_ANY, |
383 | davinci_pcm_dma_irq, substream, | 383 | davinci_pcm_dma_irq, substream, |
384 | EVENTQ_1); | 384 | prtd->params->ram_chan_q); |
385 | if (link < 0) | 385 | if (link < 0) |
386 | goto exit1; | 386 | goto exit1; |
387 | 387 | ||
@@ -477,7 +477,8 @@ static int davinci_pcm_dma_request(struct snd_pcm_substream *substream) | |||
477 | 477 | ||
478 | /* Request asp master DMA channel */ | 478 | /* Request asp master DMA channel */ |
479 | link = prtd->asp_channel = edma_alloc_channel(params->channel, | 479 | link = prtd->asp_channel = edma_alloc_channel(params->channel, |
480 | davinci_pcm_dma_irq, substream, EVENTQ_0); | 480 | davinci_pcm_dma_irq, substream, |
481 | prtd->params->asp_chan_q); | ||
481 | if (link < 0) | 482 | if (link < 0) |
482 | goto exit1; | 483 | goto exit1; |
483 | 484 | ||
@@ -800,7 +801,7 @@ static void davinci_pcm_free(struct snd_pcm *pcm) | |||
800 | dma_free_writecombine(pcm->card->dev, buf->bytes, | 801 | dma_free_writecombine(pcm->card->dev, buf->bytes, |
801 | buf->area, buf->addr); | 802 | buf->area, buf->addr); |
802 | buf->area = NULL; | 803 | buf->area = NULL; |
803 | iram_dma = (struct snd_dma_buffer *)buf->private_data; | 804 | iram_dma = buf->private_data; |
804 | if (iram_dma) { | 805 | if (iram_dma) { |
805 | sram_free(iram_dma->area, iram_dma->bytes); | 806 | sram_free(iram_dma->area, iram_dma->bytes); |
806 | kfree(iram_dma); | 807 | kfree(iram_dma); |