1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 799a58bb9859..48fca47384b7 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/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,