aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2007-07-30 16:19:20 -0700
committerJames Bottomley <jejb@mulgrave.localdomain>2007-07-31 10:51:25 -0500
commit96d32215d433c38f258159b8735f98158f6a2575 (patch)
tree6b6e6a4efd029d9648b56fa4c22771f17e32c90d /drivers/scsi
parent55d9fcf57ba5ec427544fca7abc335cf3da78160 (diff)
[SCSI] ESP: Revert ESP_BUS_TIMEOUT back down to 250
This reverts d73f5222a618a91452d41c29f5996ce3d9c63673 The bug that made us increase ESP_BUS_TIMEOUT to 275 turned out to be a memset bug on 32-bit sparc. It is better to put this back at the correct timeout value than to leave it increased when there is no reason for doing so. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/esp_scsi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/esp_scsi.h b/drivers/scsi/esp_scsi.h
index 856e38b1486..d5576d54ce7 100644
--- a/drivers/scsi/esp_scsi.h
+++ b/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)))