diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-06-17 20:04:18 -0400 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-06-17 20:04:18 -0400 |
commit | 3afa294c40013be5d8180005002e3f648d04d942 (patch) | |
tree | 8a8b7464fd8ee4901288afb3e9e8d761ef45647d /drivers/scsi/3w-xxxx.c | |
parent | a1541d5af66d02426655b1498f814c52347dd7d3 (diff) | |
parent | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (diff) |
merge by hand (qla_os.c mismerge)
Diffstat (limited to 'drivers/scsi/3w-xxxx.c')
-rw-r--r-- | drivers/scsi/3w-xxxx.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c index 48f9ece1cbd..b6dc576da43 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) | |||
1430 | 1430 | ||
1431 | tw_dev = (TW_Device_Extension *)SCpnt->device->host->hostdata; | 1431 | tw_dev = (TW_Device_Extension *)SCpnt->device->host->hostdata; |
1432 | 1432 | ||
1433 | spin_unlock_irq(tw_dev->host->host_lock); | ||
1434 | |||
1435 | tw_dev->num_resets++; | 1433 | tw_dev->num_resets++; |
1436 | 1434 | ||
1437 | 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]); | 1435 | 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) | |||
1444 | 1442 | ||
1445 | retval = SUCCESS; | 1443 | retval = SUCCESS; |
1446 | out: | 1444 | out: |
1447 | spin_lock_irq(tw_dev->host->host_lock); | ||
1448 | return retval; | 1445 | return retval; |
1449 | } /* End tw_scsi_eh_reset() */ | 1446 | } /* End tw_scsi_eh_reset() */ |
1450 | 1447 | ||