1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 4c14cde3295f..a4a6a146fccd 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1538,6 +1538,7 @@ qla2x00_set_model_info(scsi_qla_host_t *vha, uint8_t *model, size_t len,
         char *st, *en;
         uint16_t index;
         struct qla_hw_data *ha = vha->hw;
+        int use_tbl = !IS_QLA25XX(ha) && IS_QLA81XX(ha);
 
         if (memcmp(model, BINZERO, len) != 0) {
                 strncpy(ha->model_number, model, len);
@@ -1550,14 +1551,16 @@ qla2x00_set_model_info(scsi_qla_host_t *vha, uint8_t *model, size_t len,
                 }
 
                 index = (ha->pdev->subsystem_device & 0xff);
-                if (ha->pdev->subsystem_vendor == PCI_VENDOR_ID_QLOGIC &&
+                if (use_tbl &&
+                    ha->pdev->subsystem_vendor == PCI_VENDOR_ID_QLOGIC &&
                     index < QLA_MODEL_NAMES)
                         strncpy(ha->model_desc,
                             qla2x00_model_name[index * 2 + 1],
                             sizeof(ha->model_desc) - 1);
         } else {
                 index = (ha->pdev->subsystem_device & 0xff);
-                if (ha->pdev->subsystem_vendor == PCI_VENDOR_ID_QLOGIC &&
+                if (use_tbl &&
+                    ha->pdev->subsystem_vendor == PCI_VENDOR_ID_QLOGIC &&
                     index < QLA_MODEL_NAMES) {
                         strcpy(ha->model_number,
                             qla2x00_model_name[index * 2]);