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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (200 commits)
  [SCSI] usbstorage: use last_sector_bug flag universally
  [SCSI] libsas: abstract STP task status into a function
  [SCSI] ultrastor: clean up inline asm warnings
  [SCSI] aic7xxx: fix firmware build
  [SCSI] aacraid: fib context lock for management ioctls
  [SCSI] ch: remove forward declarations
  [SCSI] ch: fix device minor number management bug
  [SCSI] ch: handle class_device_create failure properly
  [SCSI] NCR5380: fix section mismatch
  [SCSI] sg: fix /proc/scsi/sg/devices when no SCSI devices
  [SCSI] IB/iSER: add logical unit reset support
  [SCSI] don't use __GFP_DMA for sense buffers if not required
  [SCSI] use dynamically allocated sense buffer
  [SCSI] scsi.h: add macro for enclosure bit of inquiry data
  [SCSI] sd: add fix for devices with last sector access problems
  [SCSI] fix pcmcia compile problem
  [SCSI] aacraid: add Voodoo Lite class of cards.
  [SCSI] aacraid: add new driver features flags
  [SCSI] qla2xxx: Update version number to 8.02.00-k7.
  [SCSI] qla2xxx: Issue correct MBC_INITIALIZE_FIRMWARE command.
  ...

1 files changed, 5 insertions, 31 deletions

diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index b7c5385e2efe..23f27c9c9895 100644
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -73,18 +73,9 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
         }
 
         if (!dir_in) {
-            /* copy to bounce buffer for a write */
-            if (cmd->use_sg)
-#if 0
-                panic ("scsi%ddma: incomplete s/g support",
-                       instance->host_no);
-#else
+                /* copy to bounce buffer for a write */
                 memcpy (HDATA(instance)->dma_bounce_buffer,
                         cmd->SCp.ptr, cmd->SCp.this_residual);
-#endif
-            else
-                memcpy (HDATA(instance)->dma_bounce_buffer,
-                        cmd->request_buffer, cmd->request_bufflen);
         }
     }
 
@@ -144,30 +135,13 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
 
     /* copy from a bounce buffer, if necessary */
     if (status && HDATA(instance)->dma_bounce_buffer) {
-        if (SCpnt && SCpnt->use_sg) {
-#if 0
-            panic ("scsi%d: incomplete s/g support",
-                   instance->host_no);
-#else
-            if( HDATA(instance)->dma_dir )
+        if( HDATA(instance)->dma_dir )
                 memcpy (SCpnt->SCp.ptr, 
                         HDATA(instance)->dma_bounce_buffer,
                         SCpnt->SCp.this_residual);
-            kfree (HDATA(instance)->dma_bounce_buffer);
-            HDATA(instance)->dma_bounce_buffer = NULL;
-            HDATA(instance)->dma_bounce_len = 0;
-            
-#endif
-        } else {
-            if (HDATA(instance)->dma_dir && SCpnt)
-                memcpy (SCpnt->request_buffer,
-                        HDATA(instance)->dma_bounce_buffer,
-                        SCpnt->request_bufflen);
-
-            kfree (HDATA(instance)->dma_bounce_buffer);
-            HDATA(instance)->dma_bounce_buffer = NULL;
-            HDATA(instance)->dma_bounce_len = 0;
-        }
+        kfree (HDATA(instance)->dma_bounce_buffer);
+        HDATA(instance)->dma_bounce_buffer = NULL;
+        HDATA(instance)->dma_bounce_len = 0;
     }
 }