5 files changed, 14 insertions, 10 deletions

diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index d2d51dc51ab8..82add77ad131 100644
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -178,10 +178,10 @@ cumanascsi_2_dma_setup(struct Scsi_Host *host, struct scsi_pointer *SCp,
                         dma_dir = DMA_MODE_READ,
                         alatch_dir = ALATCH_DMA_IN;
 
-                dma_map_sg(dev, info->sg, bufs + 1, map_dir);
+                dma_map_sg(dev, info->sg, bufs, map_dir);
 
                 disable_dma(dmach);
-                set_dma_sg(dmach, info->sg, bufs + 1);
+                set_dma_sg(dmach, info->sg, bufs);
                 writeb(alatch_dir, info->base + CUMANASCSI2_ALATCH);
                 set_dma_mode(dmach, dma_dir);
                 enable_dma(dmach);
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index d4136524fc46..ed06a8c19ad6 100644
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -175,10 +175,10 @@ eesoxscsi_dma_setup(struct Scsi_Host *host, struct scsi_pointer *SCp,
                         map_dir = DMA_FROM_DEVICE,
                         dma_dir = DMA_MODE_READ;
 
-                dma_map_sg(dev, info->sg, bufs + 1, map_dir);
+                dma_map_sg(dev, info->sg, bufs, map_dir);
 
                 disable_dma(dmach);
-                set_dma_sg(dmach, info->sg, bufs + 1);
+                set_dma_sg(dmach, info->sg, bufs);
                 set_dma_mode(dmach, dma_dir);
                 enable_dma(dmach);
                 return fasdma_real_all;
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 2969cc0ff259..fb5f20284389 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -633,7 +633,7 @@ static void fas216_updateptrs(FAS216_Info *info, int bytes_transferred)
 
         BUG_ON(bytes_transferred < 0);
 
-        info->SCpnt->request_bufflen -= bytes_transferred;
+        SCp->phase -= bytes_transferred;
 
         while (bytes_transferred != 0) {
                 if (SCp->this_residual > bytes_transferred)
@@ -715,7 +715,7 @@ static void fas216_cleanuptransfer(FAS216_Info *info)
                 return;
 
         if (dmatype == fasdma_real_all)
-                total = info->SCpnt->request_bufflen;
+                total = info->scsi.SCp.phase;
         else
                 total = info->scsi.SCp.this_residual;
 
@@ -753,7 +753,7 @@ static void fas216_transfer(FAS216_Info *info)
         fas216_log(info, LOG_BUFFER,
                    "starttransfer: buffer %p length 0x%06x reqlen 0x%06x",
                    info->scsi.SCp.ptr, info->scsi.SCp.this_residual,
-                   info->SCpnt->request_bufflen);
+                   info->scsi.SCp.phase);
 
         if (!info->scsi.SCp.ptr) {
                 fas216_log(info, LOG_ERROR, "null buffer passed to "
@@ -784,7 +784,7 @@ static void fas216_transfer(FAS216_Info *info)
         info->dma.transfer_type = dmatype;
 
         if (dmatype == fasdma_real_all)
-                fas216_set_stc(info, info->SCpnt->request_bufflen);
+                fas216_set_stc(info, info->scsi.SCp.phase);
         else
                 fas216_set_stc(info, info->scsi.SCp.this_residual);
 
@@ -2114,6 +2114,7 @@ request_sense:
         SCpnt->SCp.buffers_residual = 0;
         SCpnt->SCp.ptr = (char *)SCpnt->sense_buffer;
         SCpnt->SCp.this_residual = sizeof(SCpnt->sense_buffer);
+        SCpnt->SCp.phase = sizeof(SCpnt->sense_buffer);
         SCpnt->SCp.Message = 0;
         SCpnt->SCp.Status = 0;
         SCpnt->request_bufflen = sizeof(SCpnt->sense_buffer);
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c
index f9cd20bfb958..159047a34997 100644
--- a/drivers/scsi/arm/powertec.c
+++ b/drivers/scsi/arm/powertec.c
@@ -148,10 +148,10 @@ powertecscsi_dma_setup(struct Scsi_Host *host, struct scsi_pointer *SCp,
                         map_dir = DMA_FROM_DEVICE,
                         dma_dir = DMA_MODE_READ;
 
-                dma_map_sg(dev, info->sg, bufs + 1, map_dir);
+                dma_map_sg(dev, info->sg, bufs, map_dir);
 
                 disable_dma(dmach);
-                set_dma_sg(dmach, info->sg, bufs + 1);
+                set_dma_sg(dmach, info->sg, bufs);
                 set_dma_mode(dmach, dma_dir);
                 enable_dma(dmach);
                 return fasdma_real_all;
@@ -342,6 +342,7 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
         info->base = base;
         powertecscsi_terminator_ctl(host, term[ec->slot_no]);
 
+        info->ec = ec;
         info->info.scsi.io_base         = base + POWERTEC_FAS216_OFFSET;
         info->info.scsi.io_shift        = POWERTEC_FAS216_SHIFT;
         info->info.scsi.irq             = ec->irq;
diff --git a/drivers/scsi/arm/scsi.h b/drivers/scsi/arm/scsi.h
index 3a39579bd08e..21ba57155bea 100644
--- a/drivers/scsi/arm/scsi.h
+++ b/drivers/scsi/arm/scsi.h
@@ -80,6 +80,7 @@ static inline void init_SCp(struct scsi_cmnd *SCpnt)
                          (page_address(SCpnt->SCp.buffer->page) +
                           SCpnt->SCp.buffer->offset);
                 SCpnt->SCp.this_residual = SCpnt->SCp.buffer->length;
+                SCpnt->SCp.phase = SCpnt->request_bufflen;
 
 #ifdef BELT_AND_BRACES
                 /*
@@ -98,6 +99,7 @@ static inline void init_SCp(struct scsi_cmnd *SCpnt)
         } else {
                 SCpnt->SCp.ptr = (unsigned char *)SCpnt->request_buffer;
                 SCpnt->SCp.this_residual = SCpnt->request_bufflen;
+                SCpnt->SCp.phase = SCpnt->request_bufflen;
         }
 
         /*