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/nsp32.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/nsp32.c')
-rw-r--r-- | drivers/scsi/nsp32.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c index 029cef4ad694..6f15e7adbc65 100644 --- a/drivers/scsi/nsp32.c +++ b/drivers/scsi/nsp32.c | |||
@@ -2987,6 +2987,8 @@ static int nsp32_eh_bus_reset(struct scsi_cmnd *SCpnt) | |||
2987 | nsp32_hw_data *data = (nsp32_hw_data *)SCpnt->device->host->hostdata; | 2987 | nsp32_hw_data *data = (nsp32_hw_data *)SCpnt->device->host->hostdata; |
2988 | unsigned int base = SCpnt->device->host->io_port; | 2988 | unsigned int base = SCpnt->device->host->io_port; |
2989 | 2989 | ||
2990 | spin_lock_irq(SCpnt->device->host->host_lock); | ||
2991 | |||
2990 | nsp32_msg(KERN_INFO, "Bus Reset"); | 2992 | nsp32_msg(KERN_INFO, "Bus Reset"); |
2991 | nsp32_dbg(NSP32_DEBUG_BUSRESET, "SCpnt=0x%x", SCpnt); | 2993 | nsp32_dbg(NSP32_DEBUG_BUSRESET, "SCpnt=0x%x", SCpnt); |
2992 | 2994 | ||
@@ -2994,6 +2996,7 @@ static int nsp32_eh_bus_reset(struct scsi_cmnd *SCpnt) | |||
2994 | nsp32_do_bus_reset(data); | 2996 | nsp32_do_bus_reset(data); |
2995 | nsp32_write2(base, IRQ_CONTROL, 0); | 2997 | nsp32_write2(base, IRQ_CONTROL, 0); |
2996 | 2998 | ||
2999 | spin_unlock_irq(SCpnt->device->host->host_lock); | ||
2997 | return SUCCESS; /* SCSI bus reset is succeeded at any time. */ | 3000 | return SUCCESS; /* SCSI bus reset is succeeded at any time. */ |
2998 | } | 3001 | } |
2999 | 3002 | ||