Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm: (30 commits)
  [ARM] Acorn: move the i2c bus driver into drivers/i2c
  [ARM] ARM SCSI: Don't try to dma_map_sg too many scatterlist entries
  [ARM] ARM FAS216: don't modify scsi_cmnd request_bufflen
  [ARM] rtc-pcf8583: Final fixes for this RTC on RiscPC
  [ARM] rtc-pcf8583: correct month and year offsets
  [ARM] rtc-pcf8583: don't use BCD_TO_BIN/BIN_TO_BCD
  [ARM] EBSA110: Work around build errors
  [ARM] 4241/1: Define mb() as compiler barrier on a uniprocessor system
  [ARM] 4239/1: S3C24XX: Update kconfig entries for PM
  [ARM] 4238/1: S3C24XX: docs: update suspend and resume
  [ARM] 4237/2: oprofile: Always allow backtraces on ARM
  [ARM] Yet more asm/apm-emulation.h stuff
  ARM: OMAP: Add missing get_irqnr_preamble and arch_ret_to_user for omap2
  ARM: OMAP: Use linux/delay.h not asm/delay.h
  ARM: OMAP: Remove obsolete alsa typedefs
  ARM: OMAP: omap1510->15xx conversions needed for sx1
  ARM: OMAP: Add missing includes to board-nokia770
  ARM: OMAP: Workqueue changes for board-h4.c
  ARM: OMAP: dmtimer.c omap1 register fix
  ARM: OMAP: board-nokia770: correct lcd name
  ...

1 files changed, 5 insertions, 4 deletions

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);