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/ppa.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/ppa.c')
-rw-r--r-- | drivers/scsi/ppa.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c index 96b4522523d9..fafcf5d185e7 100644 --- a/drivers/scsi/ppa.c +++ b/drivers/scsi/ppa.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/blkdev.h> | 17 | #include <linux/blkdev.h> |
18 | #include <linux/parport.h> | 18 | #include <linux/parport.h> |
19 | #include <linux/workqueue.h> | 19 | #include <linux/workqueue.h> |
20 | #include <linux/delay.h> | ||
20 | #include <asm/io.h> | 21 | #include <asm/io.h> |
21 | 22 | ||
22 | #include <scsi/scsi.h> | 23 | #include <scsi/scsi.h> |
@@ -891,9 +892,9 @@ static int ppa_reset(struct scsi_cmnd *cmd) | |||
891 | 892 | ||
892 | ppa_connect(dev, CONNECT_NORMAL); | 893 | ppa_connect(dev, CONNECT_NORMAL); |
893 | ppa_reset_pulse(dev->base); | 894 | ppa_reset_pulse(dev->base); |
894 | udelay(1000); /* device settle delay */ | 895 | mdelay(1); /* device settle delay */ |
895 | ppa_disconnect(dev); | 896 | ppa_disconnect(dev); |
896 | udelay(1000); /* device settle delay */ | 897 | mdelay(1); /* device settle delay */ |
897 | return SUCCESS; | 898 | return SUCCESS; |
898 | } | 899 | } |
899 | 900 | ||