projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'thermal-framework' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
include
/
sound
/
memalloc.h
diff --git
a/include/sound/memalloc.h
b/include/sound/memalloc.h
index cf15b8213df7e0bd7e25e6d003f23ffd1d375674..54aff2d73150e526e6b9c71f854c42618f63c635 100644
(file)
--- a/
include/sound/memalloc.h
+++ b/
include/sound/memalloc.h
@@
-103,7
+103,7
@@
static inline dma_addr_t snd_sgbuf_get_addr(struct snd_dma_buffer *dmab,
{
struct snd_sg_buf *sgbuf = dmab->private_data;
dma_addr_t addr = sgbuf->table[offset >> PAGE_SHIFT].addr;
- addr &=
PAGE_MASK
;
+ addr &=
~((dma_addr_t)PAGE_SIZE - 1)
;
return addr + offset % PAGE_SIZE;
}