From: "Ed Lin" - remove unsuitable code from reset routine - adjust command timeout in slave_config routine to achieve intended effect of removed code Signed-off-by: Andrew Morton --- drivers/scsi/stex.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff -puN drivers/scsi/stex.c~stex-adjust-command-timeout-in-slave_config-routine drivers/scsi/stex.c --- a/drivers/scsi/stex.c~stex-adjust-command-timeout-in-slave_config-routine +++ a/drivers/scsi/stex.c @@ -519,6 +519,7 @@ stex_slave_config(struct scsi_device *sd { sdev->use_10_for_rw = 1; sdev->use_10_for_ms = 1; + sdev->timeout = 60 * HZ; return 0; } @@ -939,22 +940,9 @@ static int stex_reset(struct scsi_cmnd * { struct st_hba *hba; int tag; - int i = 0; unsigned long flags; hba = (struct st_hba *) &cmd->device->host->hostdata[0]; -wait_cmds: - spin_lock_irqsave(hba->host->host_lock, flags); - for (tag = 0; tag < MU_MAX_REQUEST; tag++) - if ((hba->tag & (1 << tag)) && hba->ccb[tag].req != NULL) - break; - spin_unlock_irqrestore(hba->host->host_lock, flags); - if (tag < MU_MAX_REQUEST) { - ssleep(1); - if (++i < 10) - goto wait_cmds; - } - hba->mu_status = MU_STATE_RESETTING; spin_lock_irqsave(hba->host->host_lock, flags); _