---

yaml
---
r: 334143
b: refs/heads/master
c: f24b5cb
h: refs/heads/master
i:
  334141: b4e612f
  334139: 61210a8
  334135: 7b8a7cb
  334127: 99afeb0
  334111: 0544733
  334079: da87173
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc977749e967daa56de1922cf4cb38525631c51c
+refs/heads/master: f24b5cb818c6789e5d42d4881f34238a5fa0b40c

trunk/drivers/scsi/qla2xxx/qla_init.c

@@ -2080,6 +2080,7 @@ qla2x00_configure_hba(scsi_qla_host_t *vha)
 	uint8_t       domain;
 	char		connect_type[22];
 	struct qla_hw_data *ha = vha->hw;
+	unsigned long flags;
 
 	/* Get host addresses. */
 	rval = qla2x00_get_adapter_id(vha,
@@ -2154,9 +2155,9 @@ qla2x00_configure_hba(scsi_qla_host_t *vha)
 	vha->d_id.b.area = area;
 	vha->d_id.b.al_pa = al_pa;
 
-	spin_lock(&ha->vport_slock);
+	spin_lock_irqsave(&ha->vport_slock, flags);
 	qlt_update_vp_map(vha, SET_AL_PA);
-	spin_unlock(&ha->vport_slock);
+	spin_unlock_irqrestore(&ha->vport_slock, flags);
 
 	if (!vha->flags.init_done)
 		ql_log(ql_log_info, vha, 0x2010,