[SCSI] qla2xxx: Enable the Flash Access Control (FAC) mailbox command.
authorJoe Carnuccio <joe.carnuccio@qlogic.com>
Wed, 26 Feb 2014 09:15:02 +0000 (04:15 -0500)
committerJames Bottomley <JBottomley@Parallels.com>
Sat, 15 Mar 2014 17:17:49 +0000 (10:17 -0700)
Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
drivers/scsi/qla2xxx/qla_init.c

index e7e5f4facf7f3c9850764b34aa5f0ac067d63351..9b271ccd33248c2d25ff85c54a929124c1c1e267 100644 (file)
@@ -1718,9 +1718,6 @@ enable_82xx_npiv:
                spin_unlock_irqrestore(&ha->hardware_lock, flags);
        }
 
-       if (IS_QLA83XX(ha))
-               goto skip_fac_check;
-
        if (rval == QLA_SUCCESS && IS_FAC_REQUIRED(ha)) {
                uint32_t size;
 
@@ -1733,7 +1730,7 @@ enable_82xx_npiv:
                            "Unsupported FAC firmware (%d.%02d.%02d).\n",
                            ha->fw_major_version, ha->fw_minor_version,
                            ha->fw_subminor_version);
-skip_fac_check:
+
                        if (IS_QLA83XX(ha)) {
                                ha->flags.fac_supported = 0;
                                rval = QLA_SUCCESS;