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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
scsi
/
imm.c
diff --git
a/drivers/scsi/imm.c
b/drivers/scsi/imm.c
index
be7f2ca
..
fc0f30a
100644
(file)
--- a/
drivers/scsi/imm.c
+++ b/
drivers/scsi/imm.c
@@
-18,6
+18,7
@@
#include <linux/blkdev.h>
#include <linux/parport.h>
#include <linux/workqueue.h>
#include <linux/blkdev.h>
#include <linux/parport.h>
#include <linux/workqueue.h>
+#include <linux/delay.h>
#include <asm/io.h>
#include <scsi/scsi.h>
#include <asm/io.h>
#include <scsi/scsi.h>
@@
-610,9
+611,9
@@
static int imm_init(imm_struct *dev)
if (imm_connect(dev, 0) != 1)
return -EIO;
imm_reset_pulse(dev->base);
if (imm_connect(dev, 0) != 1)
return -EIO;
imm_reset_pulse(dev->base);
-
udelay(1000);
/* Delay to allow devices to settle */
+
mdelay(1);
/* Delay to allow devices to settle */
imm_disconnect(dev);
imm_disconnect(dev);
-
udelay(1000);
/* Another delay to allow devices to settle */
+
mdelay(1);
/* Another delay to allow devices to settle */
return device_check(dev);
}
return device_check(dev);
}
@@
-829,7
+830,7
@@
static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd)
/* Phase 2 - We are now talking to the scsi bus */
case 2:
/* Phase 2 - We are now talking to the scsi bus */
case 2:
- if (!imm_select(dev,
cmd->device->id
)) {
+ if (!imm_select(dev,
scmd_id(cmd)
)) {
imm_fail(dev, DID_NO_CONNECT);
return 0;
}
imm_fail(dev, DID_NO_CONNECT);
return 0;
}
@@
-1026,9
+1027,9
@@
static int imm_reset(struct scsi_cmnd *cmd)
imm_connect(dev, CONNECT_NORMAL);
imm_reset_pulse(dev->base);
imm_connect(dev, CONNECT_NORMAL);
imm_reset_pulse(dev->base);
-
udelay(1000);
/* device settle delay */
+
mdelay(1);
/* device settle delay */
imm_disconnect(dev);
imm_disconnect(dev);
-
udelay(1000);
/* device settle delay */
+
mdelay(1);
/* device settle delay */
return SUCCESS;
}
return SUCCESS;
}