Merge libata branch 'chs-support' to latest upstream kernel.

[linux-2.6] / drivers / scsi / qla1280.c

diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 1a4ce1c39478b02af8cb637a7531f4842d299f4e..b993652bfa25d3acaaa7332b3ade101a8bd9310f 100644 (file)
--- 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;