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: (102 commits)
  [SCSI] scsi_dh: fix kconfig related build errors
  [SCSI] sym53c8xx: Fix bogus sym_que_entry re-implementation of container_of
  [SCSI] scsi_cmnd.h: remove double inclusion of linux/blkdev.h
  [SCSI] make struct scsi_{host,target}_type static
  [SCSI] fix locking in host use of blk_plug_device()
  [SCSI] zfcp: Cleanup external header file
  [SCSI] zfcp: Cleanup code in zfcp_erp.c
  [SCSI] zfcp: zfcp_fsf cleanup.
  [SCSI] zfcp: consolidate sysfs things into one file.
  [SCSI] zfcp: Cleanup of code in zfcp_aux.c
  [SCSI] zfcp: Cleanup of code in zfcp_scsi.c
  [SCSI] zfcp: Move status accessors from zfcp to SCSI include file.
  [SCSI] zfcp: Small QDIO cleanups
  [SCSI] zfcp: Adapter reopen for large number of unsolicited status
  [SCSI] zfcp: Fix error checking for ELS ADISC requests
  [SCSI] zfcp: wait until adapter is finished with ERP during auto-port
  [SCSI] ibmvfc: IBM Power Virtual Fibre Channel Adapter Client Driver
  [SCSI] sg: Add target reset support
  [SCSI] lib: Add support for the T10 (SCSI) Data Integrity Field CRC
  [SCSI] sd: Move scsi_disk() accessor function to sd.h
  ...

1 files changed, 13 insertions, 11 deletions

diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index 59fbef08d690..62a4618530d0 100644
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -219,19 +219,10 @@ static void esp_reset_esp(struct esp *esp)
         /* Now reset the ESP chip */
         scsi_esp_cmd(esp, ESP_CMD_RC);
         scsi_esp_cmd(esp, ESP_CMD_NULL | ESP_CMD_DMA);
+        if (esp->rev == FAST)
+                esp_write8(ESP_CONFIG2_FENAB, ESP_CFG2);
         scsi_esp_cmd(esp, ESP_CMD_NULL | ESP_CMD_DMA);
 
-        /* Reload the configuration registers */
-        esp_write8(esp->cfact, ESP_CFACT);
-
-        esp->prev_stp = 0;
-        esp_write8(esp->prev_stp, ESP_STP);
-
-        esp->prev_soff = 0;
-        esp_write8(esp->prev_soff, ESP_SOFF);
-
-        esp_write8(esp->neg_defp, ESP_TIMEO);
-
         /* This is the only point at which it is reliable to read
          * the ID-code for a fast ESP chip variants.
          */
@@ -316,6 +307,17 @@ static void esp_reset_esp(struct esp *esp)
                 break;
         }
 
+        /* Reload the configuration registers */
+        esp_write8(esp->cfact, ESP_CFACT);
+
+        esp->prev_stp = 0;
+        esp_write8(esp->prev_stp, ESP_STP);
+
+        esp->prev_soff = 0;
+        esp_write8(esp->prev_soff, ESP_SOFF);
+
+        esp_write8(esp->neg_defp, ESP_TIMEO);
+
         /* Eat any bitrot in the chip */
         esp_read8(ESP_INTRPT);
         udelay(100);