diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-05-28 07:56:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-17 12:05:10 -0500 |
| commit | 68b3aa7c9805aee9005a8ca53c5e99177961fbb9 (patch) | |
| tree | 3f28891df0b3a1ecdfe6a98547d8f3c43b74e905 /drivers/scsi/ppa.c | |
| parent | 94d0e7b805961c44e4dc486ffc21075084bb7175 (diff) | |
| download | linux-stable-68b3aa7c9805aee9005a8ca53c5e99177961fbb9.tar.gz linux-stable-68b3aa7c9805aee9005a8ca53c5e99177961fbb9.tar.bz2 linux-stable-68b3aa7c9805aee9005a8ca53c5e99177961fbb9.zip | |
[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 @@ #include <linux/blkdev.h> #include <linux/parport.h> #include <linux/workqueue.h> +#include <linux/delay.h> #include <asm/io.h> #include <scsi/scsi.h> @@ -891,9 +892,9 @@ static int ppa_reset(struct scsi_cmnd *cmd) ppa_connect(dev, CONNECT_NORMAL); ppa_reset_pulse(dev->base); - udelay(1000); /* device settle delay */ + mdelay(1); /* device settle delay */ ppa_disconnect(dev); - udelay(1000); /* device settle delay */ + mdelay(1); /* device settle delay */ return SUCCESS; } |