1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index f6da46d672f..b05737ae5ef 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;
 }