From 46309dbb91c8843dd1c04af8f10aa3da12c5476a Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Tue, 8 Jun 2010 20:03:15 +0900 Subject: [PATCH] --- yaml --- r: 200251 b: refs/heads/master c: fcdcddbcbbd39a3363bd48414bfe44553b6d698a h: refs/heads/master i: 200249: b284a2190aab7c3ceed7ff6e1d2dd386d3ea0fd8 200247: 6c955049d26ef007f24388b35c5be3ea9551ec5c v: v3 --- [refs] | 2 +- trunk/arch/microblaze/kernel/dma.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5c2fc8e5e149..a5c4956d9f66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffe57d02b23ebc5422cf81566b3ce566d68a3e22 +refs/heads/master: fcdcddbcbbd39a3363bd48414bfe44553b6d698a diff --git a/trunk/arch/microblaze/kernel/dma.c b/trunk/arch/microblaze/kernel/dma.c index 9dcd90b5df55..79c74659f204 100644 --- a/trunk/arch/microblaze/kernel/dma.c +++ b/trunk/arch/microblaze/kernel/dma.c @@ -90,7 +90,6 @@ 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) + get_dma_direct_offset(dev); - sg->dma_length = sg->length; __dma_sync_page(page_to_phys(sg_page(sg)), sg->offset, sg->length, direction); }