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/fd_mcs.c | |
| parent | 94d0e7b805961c44e4dc486ffc21075084bb7175 (diff) | |
| download | linux-68b3aa7c9805aee9005a8ca53c5e99177961fbb9.tar.gz linux-68b3aa7c9805aee9005a8ca53c5e99177961fbb9.tar.bz2 linux-68b3aa7c9805aee9005a8ca53c5e99177961fbb9.zip | |
[SCSI] allow sleeping in ->eh_bus_reset_handler()
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/fd_mcs.c')
| -rw-r--r-- | drivers/scsi/fd_mcs.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/scsi/fd_mcs.c b/drivers/scsi/fd_mcs.c index 4a358aec2e59..fa652f8aa643 100644 --- a/drivers/scsi/fd_mcs.c +++ b/drivers/scsi/fd_mcs.c @@ -1243,6 +1243,7 @@ static int fd_mcs_abort(Scsi_Cmnd * SCpnt) static int fd_mcs_bus_reset(Scsi_Cmnd * SCpnt) { struct Scsi_Host *shpnt = SCpnt->device->host; + unsigned long flags; #if DEBUG_RESET static int called_once = 0; @@ -1259,6 +1260,8 @@ static int fd_mcs_bus_reset(Scsi_Cmnd * SCpnt) { called_once = 1; #endif + spin_lock_irqsave(shpnt->host_lock, flags); + outb(1, SCSI_Cntl_port); do_pause(2); outb(0, SCSI_Cntl_port); @@ -1266,6 +1269,8 @@ static int fd_mcs_bus_reset(Scsi_Cmnd * SCpnt) { outb(0, SCSI_Mode_Cntl_port); outb(PARITY_MASK, TMC_Cntl_port); + spin_unlock_irqrestore(shpnt->host_lock, flags); + /* Unless this is the very first call (i.e., SCPnt == NULL), everything is probably hosed at this point. We will, however, try to keep things going by informing the high-level code that we need help. */ |