From: James Bottomley <jejb@titanic.(none)>
Date: Fri, 17 Jun 2005 23:42:23 +0000 (-0500)
Subject: merge by hand (fix up qla_os.c merge error)
X-Git-Tag: v2.6.13-rc1~90^2~583^2~62^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3237ee78fc00f786d5f5aec6f9310b0e39069f15;p=linux-2.6

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

3237ee78fc00f786d5f5aec6f9310b0e39069f15
diff --cc drivers/scsi/qla2xxx/qla_os.c
index 3c97aa4577,f12a2b6fa7..e6831264f6
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@@ -519,8 -476,7 +477,7 @@@ qla2xxx_eh_abort(struct scsi_cmnd *cmd
  	serial = cmd->serial_number;
  
  	/* Check active list for command command. */
- 	spin_unlock_irq(ha->host->host_lock);
 -	spin_lock(&ha->hardware_lock);
 +	spin_lock_irqsave(&ha->hardware_lock, flags);
  	for (i = 1; i < MAX_OUTSTANDING_COMMANDS; i++) {
  		sp = ha->outstanding_cmds[i];
  
@@@ -557,8 -513,8 +514,7 @@@
  			    "scsi(%ld:%d:%d): Abort handler timed out -- %lx "
  			    "%x.\n", ha->host_no, id, lun, serial, ret);
  		}
 -		spin_lock(&ha->hardware_lock);
  	}
- 	spin_lock_irq(ha->host->host_lock);
  
  	qla_printk(KERN_INFO, ha, 
  	    "scsi(%ld:%d:%d): Abort command issued -- %lx %x.\n", ha->host_no,