aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla1280.c
diff options
context:
space:
mode:
authorDave Kleikamp <shaggy@austin.ibm.com>2005-07-27 12:50:08 -0500
committerDave Kleikamp <shaggy@austin.ibm.com>2005-07-27 12:50:08 -0500
commit6de7dc2c4c713d037c19aa1e310d240f16973414 (patch)
tree68963db8081e6ef18affd06cf2e9b00578ef874e /drivers/scsi/qla1280.c
parentcbc3d65ebcb0c494183d45cf202a53352cbf3871 (diff)
parent9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff)
downloadkernel_samsung_smdk4412-6de7dc2c4c713d037c19aa1e310d240f16973414.tar.gz
kernel_samsung_smdk4412-6de7dc2c4c713d037c19aa1e310d240f16973414.tar.bz2
kernel_samsung_smdk4412-6de7dc2c4c713d037c19aa1e310d240f16973414.zip
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'drivers/scsi/qla1280.c')
-rw-r--r--drivers/scsi/qla1280.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 1a4ce1c3947..b993652bfa2 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -2853,7 +2853,7 @@ qla1280_bus_reset(struct scsi_qla_host *ha, int bus)
ha->bus_settings[bus].failed_reset_count++;
} else {
spin_unlock_irq(HOST_LOCK);
- schedule_timeout(reset_delay * HZ);
+ ssleep(reset_delay);
spin_lock_irq(HOST_LOCK);
ha->bus_settings[bus].scsi_bus_dead = 0;