diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-05-28 07:57:14 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-17 12:05:18 -0500 |
| commit | df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 (patch) | |
| tree | 552e02a44a21bd38db91729c85219542c2930ae2 /drivers/scsi/dpt_i2o.c | |
| parent | 68b3aa7c9805aee9005a8ca53c5e99177961fbb9 (diff) | |
| download | talos-op-linux-df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0.tar.gz talos-op-linux-df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0.zip | |
[SCSI] allow sleeping in ->eh_host_reset_handler()
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/dpt_i2o.c')
| -rw-r--r-- | drivers/scsi/dpt_i2o.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c index 2fd728731d5e..9cc0015b717d 100644 --- a/drivers/scsi/dpt_i2o.c +++ b/drivers/scsi/dpt_i2o.c @@ -746,7 +746,7 @@ static int adpt_bus_reset(struct scsi_cmnd* cmd) } // This version of reset is called by the eh_error_handler -static int adpt_reset(struct scsi_cmnd* cmd) +static int __adpt_reset(struct scsi_cmnd* cmd) { adpt_hba* pHba; int rcode; @@ -762,6 +762,17 @@ static int adpt_reset(struct scsi_cmnd* cmd) } } +static int adpt_reset(struct scsi_cmnd* cmd) +{ + int rc; + + spin_lock_irq(cmd->device->host->host_lock); + rc = __adpt_reset(cmd); + spin_unlock_irq(cmd->device->host->host_lock); + + return rc; +} + // This version of reset is called by the ioctls and indirectly from eh_error_handler via adpt_reset static int adpt_hba_reset(adpt_hba* pHba) { |
