1 files changed, 1 insertions, 17 deletions

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 077e5789beeb..83376f6ac3db 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -55,7 +55,6 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)
         uint16_t __iomem *optr;
         uint32_t        cnt;
         uint32_t        mboxes;
-        unsigned long   mbx_flags = 0;
         unsigned long   wait_time;
 
         rval = QLA_SUCCESS;
@@ -81,10 +80,6 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)
         /* Save mailbox command for debug */
         ha->mcp = mcp;
 
-        /* Try to get mailbox register access */
-        if (!abort_active)
-                spin_lock_irqsave(&ha->mbx_reg_lock, mbx_flags);
-
         DEBUG11(printk("scsi(%ld): prepare to issue mbox cmd=0x%x.\n",
             ha->host_no, mcp->mb[0]));
 
@@ -161,9 +156,6 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)
                         WRT_REG_WORD(&reg->isp.hccr, HCCR_SET_HOST_INT);
                 spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
-                if (!abort_active)
-                        spin_unlock_irqrestore(&ha->mbx_reg_lock, mbx_flags);
-
                 /* Wait for either the timer to expire
                  * or the mbox completion interrupt
                  */
@@ -184,8 +176,6 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)
                 else
                         WRT_REG_WORD(&reg->isp.hccr, HCCR_SET_HOST_INT);
                 spin_unlock_irqrestore(&ha->hardware_lock, flags);
-                if (!abort_active)
-                        spin_unlock_irqrestore(&ha->mbx_reg_lock, mbx_flags);
 
                 wait_time = jiffies + mcp->tov * HZ; /* wait at most tov secs */
                 while (!ha->flags.mbox_int) {
@@ -201,9 +191,6 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)
                 } /* while */
         }
 
-        if (!abort_active)
-                spin_lock_irqsave(&ha->mbx_reg_lock, mbx_flags);
-
         /* Check whether we timed out */
         if (ha->flags.mbox_int) {
                 uint16_t *iptr2;
@@ -256,9 +243,6 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)
                 rval = QLA_FUNCTION_TIMEOUT;
         }
 
-        if (!abort_active)
-                spin_unlock_irqrestore(&ha->mbx_reg_lock, mbx_flags);
-
         ha->flags.mbox_busy = 0;
 
         /* Clean up */
@@ -1713,7 +1697,7 @@ qla24xx_fabric_logout(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t domain,
         lg->entry_count = 1;
         lg->nport_handle = cpu_to_le16(loop_id);
         lg->control_flags =
-            __constant_cpu_to_le16(LCF_COMMAND_LOGO|LCF_EXPL_LOGO);
+            __constant_cpu_to_le16(LCF_COMMAND_LOGO|LCF_IMPL_LOGO);
         lg->port_id[0] = al_pa;
         lg->port_id[1] = area;
         lg->port_id[2] = domain;