summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-dma.c
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2007-10-16 12:29:34 +0200
committerJens Axboe <jens.axboe@oracle.com>2007-10-16 12:29:34 +0200
commit3eed13fd933dbb81db12f7cdec6de9268c4443b5 (patch)
treec16913706acffd4a0b29ec12cd68906b708c9a8a /drivers/ide/ide-dma.c
parenta39d113936370ba524fa9e34d6954c3625c8aa64 (diff)
parent2c941a204070ab32d92d40318a3196a7fb994c00 (diff)
downloadkernel-crypto-3eed13fd933dbb81db12f7cdec6de9268c4443b5.tar.gz
kernel-crypto-3eed13fd933dbb81db12f7cdec6de9268c4443b5.tar.xz
kernel-crypto-3eed13fd933dbb81db12f7cdec6de9268c4443b5.zip
Merge branch 'sglist-arch' into for-linus
Diffstat (limited to 'drivers/ide/ide-dma.c')
-rw-r--r--drivers/ide/ide-dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index b453211ee0f..a4cbbbaccde 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -280,7 +280,7 @@ int ide_build_dmatable (ide_drive_t *drive, struct request *rq)
}
}
- sg++;
+ sg = sg_next(sg);
i--;
}