diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-11-20 07:17:51 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-20 20:38:16 -0500 |
commit | ae6a5d37725853325a2b3460165fbc5613ce2916 (patch) | |
tree | 32e3bba8d4884d102989d06a1dfcc679fbd721b6 | |
parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) |
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>
-rw-r--r-- | sound/soc/kirkwood/kirkwood-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c index b9f16598324c..afe193066253 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) | |||
178 | } | 178 | } |
179 | 179 | ||
180 | dram = mv_mbus_dram_info(); | 180 | dram = mv_mbus_dram_info(); |
181 | addr = virt_to_phys(substream->dma_buffer.area); | 181 | addr = substream->dma_buffer.addr; |
182 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { | 182 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { |
183 | prdata->play_stream = substream; | 183 | prdata->play_stream = substream; |
184 | kirkwood_dma_conf_mbus_windows(priv->io, | 184 | kirkwood_dma_conf_mbus_windows(priv->io, |