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: (207 commits)
  [SCSI] gdth: fix CONFIG_ISA build failure
  [SCSI] esp_scsi: remove __dev{init,exit}
  [SCSI] gdth: !use_sg cleanup and use of scsi accessors
  [SCSI] gdth: Move members from SCp to gdth_cmndinfo, stage 2
  [SCSI] gdth: Setup proper per-command private data
  [SCSI] gdth: Remove gdth_ctr_tab[]
  [SCSI] gdth: switch to modern scsi host registration
  [SCSI] gdth: gdth_interrupt() gdth_get_status() & gdth_wait() fixes
  [SCSI] gdth: clean up host private data
  [SCSI] gdth: Remove virt hosts
  [SCSI] gdth: Reorder scsi_host_template intitializers
  [SCSI] gdth: kill gdth_{read,write}[bwl] wrappers
  [SCSI] gdth: Remove 2.4.x support, in-kernel changelog
  [SCSI] gdth: split out pci probing
  [SCSI] gdth: split out eisa probing
  [SCSI] gdth: split out isa probing
  gdth: Make one abuse of scsi_cmnd less obvious
  [SCSI] NCR5380: Use scsi_eh API for REQUEST_SENSE invocation
  [SCSI] usb storage: use scsi_eh API in REQUEST_SENSE execution
  [SCSI] scsi_error: Refactoring scsi_error to facilitate in synchronous REQUEST_SENSE
  ...

1 files changed, 9 insertions, 13 deletions

diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c
index 98e3fe10c1dc..dc15a22105f7 100644
--- a/drivers/scsi/sun3_NCR5380.c
+++ b/drivers/scsi/sun3_NCR5380.c
@@ -2055,7 +2055,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance)
                 sink = 1;
                 do_abort(instance);
                 cmd->result = DID_ERROR  << 16;
-                cmd->done(cmd);
+                cmd->scsi_done(cmd);
                 return;
 #endif
             case PHASE_DATAIN:
@@ -2115,7 +2115,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance)
                         sink = 1;
                         do_abort(instance);
                         cmd->result = DID_ERROR  << 16;
-                        cmd->done(cmd);
+                        cmd->scsi_done(cmd);
                         /* XXX - need to source or sink data here, as appropriate */
                     } else {
 #ifdef REAL_DMA
@@ -2254,25 +2254,21 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance)
                         cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16);
                     
 #ifdef AUTOSENSE
+                    if ((cmd->cmnd[0] == REQUEST_SENSE) &&
+                                                hostdata->ses.cmd_len) {
+                        scsi_eh_restore_cmnd(cmd, &hostdata->ses);
+                        hostdata->ses.cmd_len = 0 ;
+                    }
+
                     if ((cmd->cmnd[0] != REQUEST_SENSE) && 
                         (status_byte(cmd->SCp.Status) == CHECK_CONDITION)) {
+                        scsi_eh_prep_cmnd(cmd, &hostdata->ses, NULL, 0, ~0);
                         ASEN_PRINTK("scsi%d: performing request sense\n",
                                     HOSTNO);
-                        cmd->cmnd[0] = REQUEST_SENSE;
-                        cmd->cmnd[1] &= 0xe0;
-                        cmd->cmnd[2] = 0;
-                        cmd->cmnd[3] = 0;
-                        cmd->cmnd[4] = sizeof(cmd->sense_buffer);
-                        cmd->cmnd[5] = 0;
-                        cmd->cmd_len = COMMAND_SIZE(cmd->cmnd[0]);
-
-                        cmd->use_sg = 0;
                         /* this is initialized from initialize_SCp 
                         cmd->SCp.buffer = NULL;
                         cmd->SCp.buffers_residual = 0;
                         */
-                        cmd->request_buffer = (char *) cmd->sense_buffer;
-                        cmd->request_bufflen = sizeof(cmd->sense_buffer);
 
                         local_irq_save(flags);
                         LIST(cmd,hostdata->issue_queue);