diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-05-28 07:57:14 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-17 13:05:18 -0400 |
commit | df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 (patch) | |
tree | 552e02a44a21bd38db91729c85219542c2930ae2 /drivers/scsi/nsp32.c | |
parent | 68b3aa7c9805aee9005a8ca53c5e99177961fbb9 (diff) |
[SCSI] allow sleeping in ->eh_host_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 6f15e7adbc65..5159ceea319e 100644 --- a/drivers/scsi/nsp32.c +++ b/drivers/scsi/nsp32.c | |||
@@ -3051,11 +3051,14 @@ static int nsp32_eh_host_reset(struct scsi_cmnd *SCpnt) | |||
3051 | nsp32_msg(KERN_INFO, "Host Reset"); | 3051 | nsp32_msg(KERN_INFO, "Host Reset"); |
3052 | nsp32_dbg(NSP32_DEBUG_BUSRESET, "SCpnt=0x%x", SCpnt); | 3052 | nsp32_dbg(NSP32_DEBUG_BUSRESET, "SCpnt=0x%x", SCpnt); |
3053 | 3053 | ||
3054 | spin_lock_irq(SCpnt->device->host->host_lock); | ||
3055 | |||
3054 | nsp32hw_init(data); | 3056 | nsp32hw_init(data); |
3055 | nsp32_write2(base, IRQ_CONTROL, IRQ_CONTROL_ALL_IRQ_MASK); | 3057 | nsp32_write2(base, IRQ_CONTROL, IRQ_CONTROL_ALL_IRQ_MASK); |
3056 | nsp32_do_bus_reset(data); | 3058 | nsp32_do_bus_reset(data); |
3057 | nsp32_write2(base, IRQ_CONTROL, 0); | 3059 | nsp32_write2(base, IRQ_CONTROL, 0); |
3058 | 3060 | ||
3061 | spin_unlock_irq(SCpnt->device->host->host_lock); | ||
3059 | return SUCCESS; /* Host reset is succeeded at any time. */ | 3062 | return SUCCESS; /* Host reset is succeeded at any time. */ |
3060 | } | 3063 | } |
3061 | 3064 | ||