1 files changed, 2 insertions, 8 deletions

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index ad3cacb9192d..9746cd1e664b 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -868,10 +868,6 @@ qla2x00_abort_command(scsi_qla_host_t *ha, srb_t *sp)
         DEBUG11(printk("qla2x00_abort_command(%ld): entered.\n", ha->host_no);)
 
         fcport = sp->fcport;
-        if (atomic_read(&ha->loop_state) == LOOP_DOWN ||
-            atomic_read(&fcport->state) == FCS_DEVICE_LOST) {
-                return 1;
-        }
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
         for (handle = 1; handle < MAX_OUTSTANDING_COMMANDS; handle++) {
@@ -1008,6 +1004,8 @@ qla2x00_get_adapter_id(scsi_qla_host_t *ha, uint16_t *id, uint8_t *al_pa,
         mcp->tov = 30;
         mcp->flags = 0;
         rval = qla2x00_mailbox_command(ha, mcp);
+        if (mcp->mb[0] == MBS_COMMAND_ERROR)
+                rval = QLA_COMMAND_ERROR;
 
         /* Return data. */
         *id = mcp->mb[1];
@@ -2179,10 +2177,6 @@ qla24xx_abort_command(scsi_qla_host_t *ha, srb_t *sp)
         DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no);)
 
         fcport = sp->fcport;
-        if (atomic_read(&ha->loop_state) == LOOP_DOWN ||
-            atomic_read(&fcport->state) == FCS_DEVICE_LOST) {
-                return QLA_FUNCTION_FAILED;
-        }
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
         for (handle = 1; handle < MAX_OUTSTANDING_COMMANDS; handle++) {