summaryrefslogtreecommitdiffstats
path: root/drivers/usb/audio.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-08-08 22:17:26 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-08-08 22:17:26 +0000
commit984760dbf5e48f6224dfe9e26e03536b3d38b6cd (patch)
treea99674322e524c4c90009b3bdae5fab0eebf2094 /drivers/usb/audio.c
parenta7ce7d5e94c98ef5b867f61b2ebecd563f4b6ec9 (diff)
Merge with Linux 2.4.0-test6-pre8.
Diffstat (limited to 'drivers/usb/audio.c')
-rw-r--r--drivers/usb/audio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/audio.c b/drivers/usb/audio.c
index 5d6def562..3efd73183 100644
--- a/drivers/usb/audio.c
+++ b/drivers/usb/audio.c
@@ -422,7 +422,7 @@ static void dmabuf_release(struct dmabuf *db)
for(nr = 0; nr < NRSGBUF; nr++) {
if (!(p = db->sgbuf[nr]))
continue;
- mem_map_unreserve(MAP_NR(p));
+ mem_map_unreserve(virt_to_page(p));
free_page((unsigned long)p);
db->sgbuf[nr] = NULL;
}
@@ -464,7 +464,7 @@ static int dmabuf_init(struct dmabuf *db)
if (!p)
return -ENOMEM;
db->sgbuf[nr] = p;
- mem_map_reserve(MAP_NR(p));
+ mem_map_reserve(virt_to_page(p));
}
memset(db->sgbuf[nr], AFMT_ISUNSIGNED(db->format) ? 0x80 : 0, PAGE_SIZE);
if ((nr << PAGE_SHIFT) >= db->dmasize)