summaryrefslogtreecommitdiff
path: root/sound/soc/kirkwood
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-11-20 12:17:51 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-21 10:38:16 +0900
commitae6a5d37725853325a2b3460165fbc5613ce2916 (patch)
tree32e3bba8d4884d102989d06a1dfcc679fbd721b6 /sound/soc/kirkwood
parentf4a75d2eb7b1e2206094b901be09adb31ba63681 (diff)
downloadlinux-3.10-ae6a5d37725853325a2b3460165fbc5613ce2916.tar.gz
linux-3.10-ae6a5d37725853325a2b3460165fbc5613ce2916.tar.bz2
linux-3.10-ae6a5d37725853325a2b3460165fbc5613ce2916.zip
ASoC: kirkwood-dma: fix use of virt_to_phys()
This is part of a patch found in Rabeeh Khoury's git tree for the cubox. You can not use virt_to_phys() on the address returned from dma_alloc_coherent(); it may not be part of the kernel direct-mapped memory. Fix this to use the DMA address instead. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/kirkwood')
-rw-r--r--sound/soc/kirkwood/kirkwood-dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c
index b9f16598324..afe19306625 100644
--- a/sound/soc/kirkwood/kirkwood-dma.c
+++ b/sound/soc/kirkwood/kirkwood-dma.c
@@ -178,7 +178,7 @@ static int kirkwood_dma_open(struct snd_pcm_substream *substream)
}
dram = mv_mbus_dram_info();
- addr = virt_to_phys(substream->dma_buffer.area);
+ addr = substream->dma_buffer.addr;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
prdata->play_stream = substream;
kirkwood_dma_conf_mbus_windows(priv->io,