From 9ef46962c7a1f5790c80a1be1d3955c3c726b23c Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 25 Apr 2013 19:28:50 +0200 Subject: [PATCH] --- yaml --- r: 372056 b: refs/heads/master c: 4b417cf01657c8dcd03abb0aa49f3825fede6539 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/oss/dmabuf.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ca2740783357..8a5ce24ddfa3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7603935838ae3a85b56f0b5662ab785518d68d39 +refs/heads/master: 4b417cf01657c8dcd03abb0aa49f3825fede6539 diff --git a/trunk/sound/oss/dmabuf.c b/trunk/sound/oss/dmabuf.c index bcc3e8e07122..a59c88818f48 100644 --- a/trunk/sound/oss/dmabuf.c +++ b/trunk/sound/oss/dmabuf.c @@ -114,7 +114,7 @@ static int sound_alloc_dmap(struct dma_buffparms *dmap) } } dmap->raw_buf = start_addr; - dmap->raw_buf_phys = virt_to_bus(start_addr); + dmap->raw_buf_phys = dma_map_single(NULL, start_addr, dmap->buffsize, DMA_BIDIRECTIONAL); for (page = virt_to_page(start_addr); page <= virt_to_page(end_addr); page++) SetPageReserved(page); @@ -139,6 +139,7 @@ static void sound_free_dmap(struct dma_buffparms *dmap) for (page = virt_to_page(start_addr); page <= virt_to_page(end_addr); page++) ClearPageReserved(page); + dma_unmap_single(NULL, dmap->raw_buf_phys, dmap->buffsize, DMA_BIDIRECTIONAL); free_pages((unsigned long) dmap->raw_buf, sz); dmap->raw_buf = NULL; }