diff --git a/[refs] b/[refs]
index 451398b5346b..dbb2e8123fa0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55d9fcf57ba5ec427544fca7abc335cf3da78160
+refs/heads/master: 96d32215d433c38f258159b8735f98158f6a2575
diff --git a/trunk/drivers/scsi/esp_scsi.h b/trunk/drivers/scsi/esp_scsi.h
index 856e38b14861..d5576d54ce76 100644
--- a/trunk/drivers/scsi/esp_scsi.h
+++ b/trunk/drivers/scsi/esp_scsi.h
@@ -220,7 +220,7 @@
 #define ESP_BUSID_RESELID     0x10
 #define ESP_BUSID_CTR32BIT    0x40
 
-#define ESP_BUS_TIMEOUT        275     /* In milli-seconds */
+#define ESP_BUS_TIMEOUT        250     /* In milli-seconds */
 #define ESP_TIMEO_CONST       8192
 #define ESP_NEG_DEFP(mhz, cfact) \
         ((ESP_BUS_TIMEOUT * ((mhz) / 1000)) / (8192 * (cfact)))