]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
bnx2fc: bnx2fc_eh_abort(): fix wrong return code.
authorMaurizio Lombardi <mlombard@redhat.com>
Mon, 1 Feb 2016 15:08:45 +0000 (16:08 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 24 Feb 2016 02:27:02 +0000 (21:27 -0500)
If the link is not ready, the bnx2fc_eh_abort() function should return
FAILED.

Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
Reviewed-by: Ewan Milne <emilne@redhat.com>
Acked-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/bnx2fc/bnx2fc_io.c

index 0002caf687dd027f959e76e3e64cac52b7ded11d..2230dab67ca550549658c4d7b49f2e8bbf134e93 100644 (file)
@@ -1104,8 +1104,7 @@ int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd)
        struct bnx2fc_cmd *io_req;
        struct fc_lport *lport;
        struct bnx2fc_rport *tgt;
-       int rc = FAILED;
-
+       int rc;
 
        rc = fc_block_scsi_eh(sc_cmd);
        if (rc)
@@ -1114,7 +1113,7 @@ int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd)
        lport = shost_priv(sc_cmd->device->host);
        if ((lport->state != LPORT_ST_READY) || !(lport->link_up)) {
                printk(KERN_ERR PFX "eh_abort: link not ready\n");
-               return rc;
+               return FAILED;
        }
 
        tgt = (struct bnx2fc_rport *)&rp[1];