summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2014-05-28 12:32:07 +0000
committermarius <marius@FreeBSD.org>2014-05-28 12:32:07 +0000
commit6328a2027bcd933c2db7834d507fd83a2dedaac5 (patch)
tree3427129bc0cceea5029bd321fa1ed7a5ce41c488
parented75a5da80ab8dadf9a4594e4313cae2a34d40a7 (diff)
downloadFreeBSD-src-6328a2027bcd933c2db7834d507fd83a2dedaac5.zip
FreeBSD-src-6328a2027bcd933c2db7834d507fd83a2dedaac5.tar.gz
Commit the right version of r266793.
-rw-r--r--sys/dev/sound/pci/emu10k1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index e800730..acbb31e 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -1378,7 +1378,7 @@ emu_memalloc(struct sc_info *sc, u_int32_t sz, bus_addr_t *addr)
ofs = 0;
for (idx = start; idx < start + blksz; idx++) {
mem->bmap[idx >> 3] |= 1 << (idx & 7);
- tmp = (bus_addr_t)((u_int8_t *)(uintptr_t)blk->buf_addr + ofs);
+ tmp = (uintptr_t)((u_int8_t *)(uintptr_t)blk->buf_addr + ofs);
#ifdef EMUDEBUG
printf("pte[%d] -> %x phys, %x virt\n", idx, tmp,
((u_int32_t)buf) + ofs);
OpenPOWER on IntegriCloud