git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
scsi
/
aic7xxx_old.c
diff --git
a/drivers/scsi/aic7xxx_old.c
b/drivers/scsi/aic7xxx_old.c
index
3d61496
..
c92226b
100644
(file)
--- a/
drivers/scsi/aic7xxx_old.c
+++ b/
drivers/scsi/aic7xxx_old.c
@@
-10489,7
+10489,7
@@
aic7xxx_bus_device_reset(Scsi_Cmnd *cmd)
aic_outb(p, lastphase | ATNO, SCSISIGO);
unpause_sequencer(p, FALSE);
spin_unlock_irq(p->host->host_lock);
aic_outb(p, lastphase | ATNO, SCSISIGO);
unpause_sequencer(p, FALSE);
spin_unlock_irq(p->host->host_lock);
- s
csi_sleep(HZ
);
+ s
sleep(1
);
spin_lock_irq(p->host->host_lock);
if(aic_dev->flags & BUS_DEVICE_RESET_PENDING)
return FAILED;
spin_lock_irq(p->host->host_lock);
if(aic_dev->flags & BUS_DEVICE_RESET_PENDING)
return FAILED;
@@
-10548,7
+10548,7
@@
aic7xxx_bus_device_reset(Scsi_Cmnd *cmd)
aic_outb(p, saved_scbptr, SCBPTR);
unpause_sequencer(p, FALSE);
spin_unlock_irq(p->host->host_lock);
aic_outb(p, saved_scbptr, SCBPTR);
unpause_sequencer(p, FALSE);
spin_unlock_irq(p->host->host_lock);
-
scsi_sleep(HZ
/4);
+
msleep(1000
/4);
spin_lock_irq(p->host->host_lock);
if(aic_dev->flags & BUS_DEVICE_RESET_PENDING)
return FAILED;
spin_lock_irq(p->host->host_lock);
if(aic_dev->flags & BUS_DEVICE_RESET_PENDING)
return FAILED;
@@
-10786,7
+10786,7
@@
aic7xxx_abort(Scsi_Cmnd *cmd)
}
unpause_sequencer(p, FALSE);
spin_unlock_irq(p->host->host_lock);
}
unpause_sequencer(p, FALSE);
spin_unlock_irq(p->host->host_lock);
-
scsi_sleep(HZ
/4);
+
msleep(1000
/4);
spin_lock_irq(p->host->host_lock);
if (p->flags & AHC_ABORT_PENDING)
{
spin_lock_irq(p->host->host_lock);
if (p->flags & AHC_ABORT_PENDING)
{
@@
-10887,7
+10887,7
@@
aic7xxx_reset(Scsi_Cmnd *cmd)
aic7xxx_run_done_queue(p, TRUE);
unpause_sequencer(p, FALSE);
spin_unlock_irq(p->host->host_lock);
aic7xxx_run_done_queue(p, TRUE);
unpause_sequencer(p, FALSE);
spin_unlock_irq(p->host->host_lock);
- s
csi_sleep(2 * HZ
);
+ s
sleep(2
);
spin_lock_irq(p->host->host_lock);
return SUCCESS;
}
spin_lock_irq(p->host->host_lock);
return SUCCESS;
}
@@
-11139,6
+11139,7
@@
aic7xxx_print_scratch_ram(struct aic7xxx_host *p)
#include "aic7xxx_old/aic7xxx_proc.c"
MODULE_LICENSE("Dual BSD/GPL");
#include "aic7xxx_old/aic7xxx_proc.c"
MODULE_LICENSE("Dual BSD/GPL");
+MODULE_VERSION(AIC7XXX_H_VERSION);
static Scsi_Host_Template driver_template = {
static Scsi_Host_Template driver_template = {