From 8d3808852ea8541c6a0424b5379354dcf74981c7 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Mon, 8 Oct 2012 09:23:54 +0200 Subject: [PATCH] --- yaml --- r: 334143 b: refs/heads/master c: f24b5cb818c6789e5d42d4881f34238a5fa0b40c h: refs/heads/master i: 334141: b4e612fa8eb777fb47ec0688904e5aa8153ef5c1 334139: 61210a820ac477f9d44d523f9906a8744d4682b6 334135: 7b8a7cb72b788c53cc41cf90291f4fcd7410eb0e 334127: 99afeb0750ad121244d068155e821d53a79f609e 334111: 0544733822fbecdcff6f1b2d14ea78394df989c9 334079: da87173d25056f0780adf3d10a1cd0326095d1f2 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_init.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7d50c54188fa..e9c3f5789bec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc977749e967daa56de1922cf4cb38525631c51c +refs/heads/master: f24b5cb818c6789e5d42d4881f34238a5fa0b40c diff --git a/trunk/drivers/scsi/qla2xxx/qla_init.c b/trunk/drivers/scsi/qla2xxx/qla_init.c index 799a58bb9859..48fca47384b7 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_init.c +++ b/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,