Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / scsi / qla2xxx / qla_sup.c

diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 76de9574b385e51d4f5696f9b0282c0fe95182dd..22070621206c78d6eec28666dad84e3a6a756329 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -669,6 +669,13 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)
                def = 1;
        else if (IS_QLA81XX(ha))
                def = 2;
+
+       /* Assign FCP prio region since older adapters may not have FLT, or
+          FCP prio region in it's FLT.
+        */
+       ha->flt_region_fcp_prio = ha->flags.port0 ?
+           fcp_prio_cfg0[def] : fcp_prio_cfg1[def];
+
        ha->flt_region_flt = flt_addr;
        wptr = (uint16_t *)req->ring;
        flt = (struct qla_flt_header *)req->ring;
@@ -696,10 +703,6 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)
                goto no_flash_data;
        }
 
-       /* Assign FCP prio region since older FLT's may not have it */
-       ha->flt_region_fcp_prio = ha->flags.port0 ?
-           fcp_prio_cfg0[def] : fcp_prio_cfg1[def];
-
        loc = locations[1];
        cnt = le16_to_cpu(flt->length) / sizeof(struct qla_flt_region);
        for ( ; cnt; cnt--, region++) {