projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 's390', 'arm/renesas', 'arm/msm', 'arm/shmobile', 'arm/smmu', 'x86...
[cascardo/linux.git]
/
arch
/
microblaze
/
kernel
/
dma.c
diff --git
a/arch/microblaze/kernel/dma.c
b/arch/microblaze/kernel/dma.c
index
c89da63
..
bf4dec2
100644
(file)
--- a/
arch/microblaze/kernel/dma.c
+++ b/
arch/microblaze/kernel/dma.c
@@
-61,7
+61,8
@@
static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,
/* FIXME this part of code is untested */
for_each_sg(sgl, sg, nents, i) {
sg->dma_address = sg_phys(sg);
/* FIXME this part of code is untested */
for_each_sg(sgl, sg, nents, i) {
sg->dma_address = sg_phys(sg);
- __dma_sync(sg_phys(sg), sg->length, direction);
+ __dma_sync(page_to_phys(sg_page(sg)) + sg->offset,
+ sg->length, direction);
}
return nents;
}
return nents;