diff options
-rw-r--r-- | sound/soc/blackfin/bf5xx-ac97-pcm.c | 8 | ||||
-rw-r--r-- | sound/soc/blackfin/bf5xx-i2s-pcm.c | 3 | ||||
-rw-r--r-- | sound/soc/blackfin/bf5xx-tdm-pcm.c | 3 |
3 files changed, 4 insertions, 10 deletions
diff --git a/sound/soc/blackfin/bf5xx-ac97-pcm.c b/sound/soc/blackfin/bf5xx-ac97-pcm.c index cf0dfb7ca221..67cbfe7283da 100644 --- a/sound/soc/blackfin/bf5xx-ac97-pcm.c +++ b/sound/soc/blackfin/bf5xx-ac97-pcm.c | |||
@@ -349,9 +349,7 @@ static int bf5xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) | |||
349 | sport_handle->tx_dma_buf = dma_alloc_coherent(NULL, \ | 349 | sport_handle->tx_dma_buf = dma_alloc_coherent(NULL, \ |
350 | size, &sport_handle->tx_dma_phy, GFP_KERNEL); | 350 | size, &sport_handle->tx_dma_phy, GFP_KERNEL); |
351 | if (!sport_handle->tx_dma_buf) { | 351 | if (!sport_handle->tx_dma_buf) { |
352 | pr_err("Failed to allocate memory for tx dma \ | 352 | pr_err("Failed to allocate memory for tx dma buf - Please increase uncached DMA memory region\n"); |
353 | buf - Please increase uncached DMA \ | ||
354 | memory region\n"); | ||
355 | return -ENOMEM; | 353 | return -ENOMEM; |
356 | } else | 354 | } else |
357 | memset(sport_handle->tx_dma_buf, 0, size); | 355 | memset(sport_handle->tx_dma_buf, 0, size); |
@@ -362,9 +360,7 @@ static int bf5xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) | |||
362 | sport_handle->rx_dma_buf = dma_alloc_coherent(NULL, \ | 360 | sport_handle->rx_dma_buf = dma_alloc_coherent(NULL, \ |
363 | size, &sport_handle->rx_dma_phy, GFP_KERNEL); | 361 | size, &sport_handle->rx_dma_phy, GFP_KERNEL); |
364 | if (!sport_handle->rx_dma_buf) { | 362 | if (!sport_handle->rx_dma_buf) { |
365 | pr_err("Failed to allocate memory for rx dma \ | 363 | pr_err("Failed to allocate memory for rx dma buf - Please increase uncached DMA memory region\n"); |
366 | buf - Please increase uncached DMA \ | ||
367 | memory region\n"); | ||
368 | return -ENOMEM; | 364 | return -ENOMEM; |
369 | } else | 365 | } else |
370 | memset(sport_handle->rx_dma_buf, 0, size); | 366 | memset(sport_handle->rx_dma_buf, 0, size); |
diff --git a/sound/soc/blackfin/bf5xx-i2s-pcm.c b/sound/soc/blackfin/bf5xx-i2s-pcm.c index 62fbb8459569..c6c6a4a7d948 100644 --- a/sound/soc/blackfin/bf5xx-i2s-pcm.c +++ b/sound/soc/blackfin/bf5xx-i2s-pcm.c | |||
@@ -207,8 +207,7 @@ static int bf5xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) | |||
207 | buf->area = dma_alloc_coherent(pcm->card->dev, size, | 207 | buf->area = dma_alloc_coherent(pcm->card->dev, size, |
208 | &buf->addr, GFP_KERNEL); | 208 | &buf->addr, GFP_KERNEL); |
209 | if (!buf->area) { | 209 | if (!buf->area) { |
210 | pr_err("Failed to allocate dma memory \ | 210 | pr_err("Failed to allocate dma memory - Please increase uncached DMA memory region\n"); |
211 | Please increase uncached DMA memory region\n"); | ||
212 | return -ENOMEM; | 211 | return -ENOMEM; |
213 | } | 212 | } |
214 | buf->bytes = size; | 213 | buf->bytes = size; |
diff --git a/sound/soc/blackfin/bf5xx-tdm-pcm.c b/sound/soc/blackfin/bf5xx-tdm-pcm.c index a8c73cbbd685..5e03bb2f3cd7 100644 --- a/sound/soc/blackfin/bf5xx-tdm-pcm.c +++ b/sound/soc/blackfin/bf5xx-tdm-pcm.c | |||
@@ -244,8 +244,7 @@ static int bf5xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) | |||
244 | buf->area = dma_alloc_coherent(pcm->card->dev, size * 4, | 244 | buf->area = dma_alloc_coherent(pcm->card->dev, size * 4, |
245 | &buf->addr, GFP_KERNEL); | 245 | &buf->addr, GFP_KERNEL); |
246 | if (!buf->area) { | 246 | if (!buf->area) { |
247 | pr_err("Failed to allocate dma memory \ | 247 | pr_err("Failed to allocate dma memory - Please increase uncached DMA memory region\n"); |
248 | Please increase uncached DMA memory region\n"); | ||
249 | return -ENOMEM; | 248 | return -ENOMEM; |
250 | } | 249 | } |
251 | buf->bytes = size; | 250 | buf->bytes = size; |