diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-05-28 07:56:31 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-17 13:05:10 -0400 |
commit | 68b3aa7c9805aee9005a8ca53c5e99177961fbb9 (patch) | |
tree | 3f28891df0b3a1ecdfe6a98547d8f3c43b74e905 /drivers/scsi/seagate.c | |
parent | 94d0e7b805961c44e4dc486ffc21075084bb7175 (diff) |
[SCSI] allow sleeping in ->eh_bus_reset_handler()
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/seagate.c')
-rw-r--r-- | drivers/scsi/seagate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/seagate.c b/drivers/scsi/seagate.c index ae9fdb52847b..a0cace9aeb79 100644 --- a/drivers/scsi/seagate.c +++ b/drivers/scsi/seagate.c | |||
@@ -97,6 +97,7 @@ | |||
97 | #include <linux/delay.h> | 97 | #include <linux/delay.h> |
98 | #include <linux/blkdev.h> | 98 | #include <linux/blkdev.h> |
99 | #include <linux/stat.h> | 99 | #include <linux/stat.h> |
100 | #include <linux/delay.h> | ||
100 | 101 | ||
101 | #include <asm/io.h> | 102 | #include <asm/io.h> |
102 | #include <asm/system.h> | 103 | #include <asm/system.h> |
@@ -1631,7 +1632,7 @@ static int seagate_st0x_bus_reset(Scsi_Cmnd * SCpnt) | |||
1631 | /* assert RESET signal on SCSI bus. */ | 1632 | /* assert RESET signal on SCSI bus. */ |
1632 | WRITE_CONTROL (BASE_CMD | CMD_RST); | 1633 | WRITE_CONTROL (BASE_CMD | CMD_RST); |
1633 | 1634 | ||
1634 | udelay (20 * 1000); | 1635 | mdelay (20); |
1635 | 1636 | ||
1636 | WRITE_CONTROL (BASE_CMD); | 1637 | WRITE_CONTROL (BASE_CMD); |
1637 | st0x_aborted = DID_RESET; | 1638 | st0x_aborted = DID_RESET; |