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

1 files changed, 0 insertions, 3 deletions

diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 48f9ece1cbd0..b6dc576da430 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -1430,8 +1430,6 @@ static int tw_scsi_eh_reset(struct scsi_cmnd *SCpnt)
 
         tw_dev = (TW_Device_Extension *)SCpnt->device->host->hostdata;
 
-        spin_unlock_irq(tw_dev->host->host_lock);
-
         tw_dev->num_resets++;
 
         printk(KERN_WARNING "3w-xxxx: scsi%d: WARNING: Unit #%d: Command (0x%x) timed out, resetting card.\n", tw_dev->host->host_no, SCpnt->device->id, SCpnt->cmnd[0]);
@@ -1444,7 +1442,6 @@ static int tw_scsi_eh_reset(struct scsi_cmnd *SCpnt)
 
         retval = SUCCESS;
 out:
-        spin_lock_irq(tw_dev->host->host_lock);
         return retval;
 } /* End tw_scsi_eh_reset() */