diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-01 12:38:59 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-01 12:38:59 +0100 |
| commit | 6679ee1870f7ccdd48e2e5c57919240b8f19a6dc (patch) | |
| tree | 225ed7efcc0bb7e3c90233576c6106538e17a275 /sound/soc/blackfin/bf5xx-tdm-pcm.c | |
| parent | a91a4aa1ee994abeb2190a1bb2f703933609a703 (diff) | |
| parent | a0b62329bb290c10d7278809af910ed115768991 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/blackfin/bf5xx-tdm-pcm.c')
| -rw-r--r-- | sound/soc/blackfin/bf5xx-tdm-pcm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/blackfin/bf5xx-tdm-pcm.c b/sound/soc/blackfin/bf5xx-tdm-pcm.c index a8c73cbbd68..5e03bb2f3cd 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) buf->area = dma_alloc_coherent(pcm->card->dev, size * 4, &buf->addr, GFP_KERNEL); if (!buf->area) { - pr_err("Failed to allocate dma memory \ - Please increase uncached DMA memory region\n"); + pr_err("Failed to allocate dma memory - Please increase uncached DMA memory region\n"); return -ENOMEM; } buf->bytes = size; |