diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/omap/omap-pcm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 690bfeaec4a0..e9084fdd2082 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c | |||
@@ -97,7 +97,7 @@ static int omap_pcm_hw_params(struct snd_pcm_substream *substream, | |||
97 | prtd->dma_data = dma_data; | 97 | prtd->dma_data = dma_data; |
98 | err = omap_request_dma(dma_data->dma_req, dma_data->name, | 98 | err = omap_request_dma(dma_data->dma_req, dma_data->name, |
99 | omap_pcm_dma_irq, substream, &prtd->dma_ch); | 99 | omap_pcm_dma_irq, substream, &prtd->dma_ch); |
100 | if (!cpu_is_omap1510()) { | 100 | if (!err & !cpu_is_omap1510()) { |
101 | /* | 101 | /* |
102 | * Link channel with itself so DMA doesn't need any | 102 | * Link channel with itself so DMA doesn't need any |
103 | * reprogramming while looping the buffer | 103 | * reprogramming while looping the buffer |
@@ -147,12 +147,14 @@ static int omap_pcm_prepare(struct snd_pcm_substream *substream) | |||
147 | dma_params.src_or_dst_synch = OMAP_DMA_DST_SYNC; | 147 | dma_params.src_or_dst_synch = OMAP_DMA_DST_SYNC; |
148 | dma_params.src_start = runtime->dma_addr; | 148 | dma_params.src_start = runtime->dma_addr; |
149 | dma_params.dst_start = dma_data->port_addr; | 149 | dma_params.dst_start = dma_data->port_addr; |
150 | dma_params.dst_port = OMAP_DMA_PORT_MPUI; | ||
150 | } else { | 151 | } else { |
151 | dma_params.src_amode = OMAP_DMA_AMODE_CONSTANT; | 152 | dma_params.src_amode = OMAP_DMA_AMODE_CONSTANT; |
152 | dma_params.dst_amode = OMAP_DMA_AMODE_POST_INC; | 153 | dma_params.dst_amode = OMAP_DMA_AMODE_POST_INC; |
153 | dma_params.src_or_dst_synch = OMAP_DMA_SRC_SYNC; | 154 | dma_params.src_or_dst_synch = OMAP_DMA_SRC_SYNC; |
154 | dma_params.src_start = dma_data->port_addr; | 155 | dma_params.src_start = dma_data->port_addr; |
155 | dma_params.dst_start = runtime->dma_addr; | 156 | dma_params.dst_start = runtime->dma_addr; |
157 | dma_params.src_port = OMAP_DMA_PORT_MPUI; | ||
156 | } | 158 | } |
157 | /* | 159 | /* |
158 | * Set DMA transfer frame size equal to ALSA period size and frame | 160 | * Set DMA transfer frame size equal to ALSA period size and frame |