Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (85 commits)
  [SCSI] 53c700: remove reliance on deprecated cmnd fields
  [SCSI] hptiop: don't use cmnd->bufflen
  [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
  [SCSI] aacraid: small misc. cleanups
  [SCSI] aacraid: Update supported product information
  [SCSI] aacraid: Fix return code interpretation
  [SCSI] scsi_transport_sas: fix panic in sas_free_rphy
  [SCSI] remove RQ_SCSI_* flags
  [SCSI] remove scsi_request infrastructure
  [SCSI] mptfusion: change driver revision to 3.03.10
  [SCSI] mptfc: abort of board reset leaves port dead requiring reboot
  [SCSI] mptfc: fix fibre channel infinite request/response loop
  [SCSI] mptfc: set fibre channel fw target missing timers to one second
  [SCSI] mptfusion: move fc event/reset handling to mptfc
  [SCSI] spi transport: don't allow dt to be set on SE or HVD buses
  [SCSI] aic7xxx: expose the bus setting to sysfs
  [SCSI] scsi: remove Documentation/scsi/cpqfc.txt
  [SCSI] drivers/scsi: Use ARRAY_SIZE macro
  [SCSI] Remove last page_address from dc395x.c
  [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
  ...

Fixed up conflicts in drivers/message/fusion/mptbase.c manually (due to
the sparc interrupt cleanups)

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 2a0e18a48748..b2bafc37c414 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -513,7 +513,7 @@ static void mts_do_sg (struct urb* transfer, struct pt_regs *regs)
                 mts_transfer_cleanup(transfer);
         }
 
-        sg = context->srb->buffer;
+        sg = context->srb->request_buffer;
         context->fragment++;
         mts_int_submit_urb(transfer,
                            context->data_pipe,
@@ -549,19 +549,19 @@ mts_build_transfer_context( Scsi_Cmnd *srb, struct mts_desc* desc )
         desc->context.fragment = 0;
 
         if (!srb->use_sg) {
-                if ( !srb->bufflen ){
+                if ( !srb->request_bufflen ){
                         desc->context.data = NULL;
                         desc->context.data_length = 0;
                         return;
                 } else {
-                        desc->context.data = srb->buffer;
-                        desc->context.data_length = srb->bufflen;
+                        desc->context.data = srb->request_buffer;
+                        desc->context.data_length = srb->request_bufflen;
                         MTS_DEBUG("length = %d or %d\n",
                                   srb->request_bufflen, srb->bufflen);
                 }
         } else {
                 MTS_DEBUG("Using scatter/gather\n");
-                sg = srb->buffer;
+                sg = srb->request_buffer;
                 desc->context.data = page_address(sg[0].page) + sg[0].offset;
                 desc->context.data_length = sg[0].length;
         }