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/mesh.c | |
| parent | 68b3aa7c9805aee9005a8ca53c5e99177961fbb9 (diff) | |
| download | linux-df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0.tar.gz linux-df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0.tar.bz2 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/mesh.c')
| -rw-r--r-- | drivers/scsi/mesh.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c index f6da46d672f1..b05737ae5eff 100644 --- a/drivers/scsi/mesh.c +++ b/drivers/scsi/mesh.c @@ -1715,9 +1715,12 @@ static int mesh_host_reset(struct scsi_cmnd *cmd) struct mesh_state *ms = (struct mesh_state *) cmd->device->host->hostdata; volatile struct mesh_regs __iomem *mr = ms->mesh; volatile struct dbdma_regs __iomem *md = ms->dma; + unsigned long flags; printk(KERN_DEBUG "mesh_host_reset\n"); + spin_lock_irqsave(ms->host->host_lock, flags); + /* Reset the controller & dbdma channel */ out_le32(&md->control, (RUN|PAUSE|FLUSH|WAKE) << 16); /* stop dma */ out_8(&mr->exception, 0xff); /* clear all exception bits */ @@ -1739,6 +1742,7 @@ static int mesh_host_reset(struct scsi_cmnd *cmd) /* Complete pending commands */ handle_reset(ms); + spin_unlock_irqrestore(ms->host->host_lock, flags); return SUCCESS; } |