merge by hand (fix up qla_os.c merge error)

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c
index 0ee49dc50b85..04a06b71a5e2 100644
--- a/drivers/scsi/eata_pio.c
+++ b/drivers/scsi/eata_pio.c
@@ -486,8 +486,11 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd)
 
         DBG(DBG_ABNORM, printk(KERN_WARNING "eata_pio_reset called pid:%ld target:" " %x lun: %x reason %x\n", cmd->pid, cmd->device->id, cmd->device->lun, cmd->abort_reason));
 
+        spin_lock_irq(host->host_lock);
+
         if (HD(cmd)->state == RESET) {
                 printk(KERN_WARNING "eata_pio_reset: exit, already in reset.\n");
+                spin_unlock_irq(host->host_lock);
                 return FAILED;
         }
 
@@ -536,6 +539,8 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd)
 
         HD(cmd)->state = 0;
 
+        spin_unlock_irq(host->host_lock);
+
         if (success) {          /* hmmm... */
                 DBG(DBG_ABNORM, printk(KERN_WARNING "eata_pio_reset: exit, success.\n"));
                 return SUCCESS;