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: (63 commits)
  Fix memory leak in dm-crypt
  SPARC64: sg chaining support
  SPARC: sg chaining support
  PPC: sg chaining support
  PS3: sg chaining support
  IA64: sg chaining support
  x86-64: enable sg chaining
  x86-64: update pci-gart iommu to sg helpers
  x86-64: update nommu to sg helpers
  x86-64: update calgary iommu to sg helpers
  swiotlb: sg chaining support
  i386: enable sg chaining
  i386 dma_map_sg: convert to using sg helpers
  mmc: need to zero sglist on init
  Panic in blk_rq_map_sg() from CCISS driver
  remove sglist_len
  remove blk_queue_max_phys_segments in libata
  revert sg segment size ifdefs
  Fixup u14-34f ENABLE_SG_CHAINING
  qla1280: enable use_sg_chaining option
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 822a3aa4fae5..626bb3c9af2b 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -293,7 +293,7 @@ nextSGEset:
         for (ii=0; ii < (numSgeThisFrame-1); ii++) {
                 thisxfer = sg_dma_len(sg);
                 if (thisxfer == 0) {
-                        sg ++; /* Get next SG element from the OS */
+                        sg = sg_next(sg); /* Get next SG element from the OS */
                         sg_done++;
                         continue;
                 }
@@ -301,7 +301,7 @@ nextSGEset:
                 v2 = sg_dma_address(sg);
                 mptscsih_add_sge(psge, sgflags | thisxfer, v2);
 
-                sg++;           /* Get next SG element from the OS */
+                sg = sg_next(sg);       /* Get next SG element from the OS */
                 psge += (sizeof(u32) + sizeof(dma_addr_t));
                 sgeOffset += (sizeof(u32) + sizeof(dma_addr_t));
                 sg_done++;
@@ -322,7 +322,7 @@ nextSGEset:
                 v2 = sg_dma_address(sg);
                 mptscsih_add_sge(psge, sgflags | thisxfer, v2);
                 /*
-                sg++;
+                sg = sg_next(sg);
                 psge += (sizeof(u32) + sizeof(dma_addr_t));
                 */
                 sgeOffset += (sizeof(u32) + sizeof(dma_addr_t));