1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index ca22526aff7f..71ff3936da4f 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -3255,7 +3255,7 @@ static int pmcraid_copy_sglist(
         int direction
 )
 {
-        struct scatterlist *scatterlist;
+        struct scatterlist *sg;
         void *kaddr;
         int bsize_elem;
         int i;
@@ -3264,10 +3264,10 @@ static int pmcraid_copy_sglist(
         /* Determine the actual number of bytes per element */
         bsize_elem = PAGE_SIZE * (1 << sglist->order);
 
-        scatterlist = sglist->scatterlist;
+        sg = sglist->scatterlist;
 
-        for (i = 0; i < (len / bsize_elem); i++, buffer += bsize_elem) {
-                struct page *page = sg_page(&scatterlist[i]);
+        for (i = 0; i < (len / bsize_elem); i++, sg = sg_next(sg), buffer += bsize_elem) {
+                struct page *page = sg_page(sg);
 
                 kaddr = kmap(page);
                 if (direction == DMA_TO_DEVICE)
@@ -3282,11 +3282,11 @@ static int pmcraid_copy_sglist(
                         return -EFAULT;
                 }
 
-                scatterlist[i].length = bsize_elem;
+                sg->length = bsize_elem;
         }
 
         if (len % bsize_elem) {
-                struct page *page = sg_page(&scatterlist[i]);
+                struct page *page = sg_page(sg);
 
                 kaddr = kmap(page);
 
@@ -3297,7 +3297,7 @@ static int pmcraid_copy_sglist(
 
                 kunmap(page);
 
-                scatterlist[i].length = len % bsize_elem;
+                sg->length = len % bsize_elem;
         }
 
         if (rc) {