]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
sparc64: zero out dma_length
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Tue, 23 Oct 2007 10:58:39 +0000 (12:58 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 23 Oct 2007 10:58:39 +0000 (12:58 +0200)
zero out dma_length in the entry immediately following the last mapped
entry for unmap_sg.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
arch/sparc64/kernel/iommu_common.c

index 78e8277df655063a05ce374cc0911a27e4a8e96d..b70324e0d83d8979f7aa65857f387fa47ebb63d5 100644 (file)
@@ -233,6 +233,11 @@ unsigned long prepare_sg(struct scatterlist *sg, int nents)
        dma_sg->dma_address = dent_addr;
        dma_sg->dma_length = dent_len;
 
+       if (dma_sg != sg) {
+               dma_sg = next_sg(dma_sg);
+               dma_sg->dma_length = 0;
+       }
+
        return ((unsigned long) dent_addr +
                (unsigned long) dent_len +
                (IO_PAGE_SIZE - 1UL)) >> IO_PAGE_SHIFT;