aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 12:08:13 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 12:08:13 -0400
commitb6257a9036f06878a0f02354d5a07f155e1cfee0 (patch)
treec0e12e3568199b748ebc7c1f9cf4005ae5da5f36 /lib
parentc548f08a4f7b89b93c805e0c4024b8302afa7121 (diff)
parentf5c0dde4c66421a3a2d7d6fa604a712c9b0744e5 (diff)
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block: [SCSI] Remove full sg table memset() [SCSI] ide-scsi: remove usage of sg_last() Fix loop terminating conditions in fill_sg(). [BLOCK] Clear sg entry before filling in blk_rq_map_sg() IA64: iommu uses sg_next with an invalid sg element cciss: disable DMA refetch on Smart Array P600 swiotlb: fix map_sg failure handling SPARC64: fix iommu sg chaining [SCSI] ide-scsi: use scsi_sg_count() instead of ->use_sg
Diffstat (limited to 'lib')
-rw-r--r--lib/swiotlb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index c419ecf334c3..752fd95323f3 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -696,7 +696,7 @@ swiotlb_map_sg(struct device *hwdev, struct scatterlist *sgl, int nelems,
696 /* Don't panic here, we expect map_sg users 696 /* Don't panic here, we expect map_sg users
697 to do proper error handling. */ 697 to do proper error handling. */
698 swiotlb_full(hwdev, sg->length, dir, 0); 698 swiotlb_full(hwdev, sg->length, dir, 0);
699 swiotlb_unmap_sg(hwdev, sg - i, i, dir); 699 swiotlb_unmap_sg(hwdev, sgl, i, dir);
700 sgl[0].dma_length = 0; 700 sgl[0].dma_length = 0;
701 return 0; 701 return 0;
702 } 702 }