aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2007-10-17 10:51:20 +0200
committerJens Axboe <jens.axboe@oracle.com>2007-10-17 10:51:20 +0200
commitbdb02504f473be6a785741093913ea2acd05626f (patch)
tree6365038f20fd6bf68adfdb37c2be25f396bcc1d2 /arch/ia64
parent8bf50f71cbfc7d043f0f135da72b3feefeaa0eb8 (diff)
downloadkernel_samsung_smdk4412-bdb02504f473be6a785741093913ea2acd05626f.zip
kernel_samsung_smdk4412-bdb02504f473be6a785741093913ea2acd05626f.tar.gz
kernel_samsung_smdk4412-bdb02504f473be6a785741093913ea2acd05626f.tar.bz2
IA64: iommu uses sg_next with an invalid sg element
sg list elements might not be continuous. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/hp/common/sba_iommu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index 4338f41..3c95f41 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -1179,7 +1179,6 @@ sba_fill_pdir(
u64 *pdirp = NULL;
unsigned long dma_offset = 0;
- dma_sg--;
while (nents-- > 0) {
int cnt = startsg->dma_length;
startsg->dma_length = 0;
@@ -1201,7 +1200,8 @@ sba_fill_pdir(
u32 pide = startsg->dma_address & ~PIDE_FLAG;
dma_offset = (unsigned long) pide & ~iovp_mask;
startsg->dma_address = 0;
- dma_sg = sg_next(dma_sg);
+ if (n_mappings)
+ dma_sg = sg_next(dma_sg);
dma_sg->dma_address = pide | ioc->ibase;
pdirp = &(ioc->pdir_base[pide >> iovp_shift]);
n_mappings++;