summaryrefslogtreecommitdiff
path: root/drivers/scsi/qla2xxx/qla_init.c
diff options
context:
space:
mode:
authorandrew.vasquez@qlogic.com <andrew.vasquez@qlogic.com>2006-03-09 14:27:24 -0800
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-03-12 09:38:42 -0600
commit1328962eb4b00dd1cfd1ffb863b1612b08751768 (patch)
tree7dab09b695ed59b43625d88b5e5852620e06fb92 /drivers/scsi/qla2xxx/qla_init.c
parent48c02fde949f15920c0018d33d285fd39730d24b (diff)
downloadlinux-3.10-1328962eb4b00dd1cfd1ffb863b1612b08751768.tar.gz
linux-3.10-1328962eb4b00dd1cfd1ffb863b1612b08751768.tar.bz2
linux-3.10-1328962eb4b00dd1cfd1ffb863b1612b08751768.zip
[SCSI] qla2xxx: NVRAM id-list updates.
Resync with latest NVRAM subsystem ID list. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_init.c')
-rw-r--r--drivers/scsi/qla2xxx/qla_init.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index d4389095b4b..3bc3e1749f3 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1505,9 +1505,9 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
index = (ha->pdev->subsystem_device & 0xff);
if (index < QLA_MODEL_NAMES) {
strcpy(ha->model_number,
- qla2x00_model_name[index]);
+ qla2x00_model_name[index * 2]);
ha->model_desc =
- qla2x00_model_desc[index];
+ qla2x00_model_name[index * 2 + 1];
} else {
strcpy(ha->model_number, "QLA23xx");
}
@@ -3373,7 +3373,7 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
index = (ha->pdev->subsystem_device & 0xff);
if (index < QLA_MODEL_NAMES)
- ha->model_desc = qla2x00_model_desc[index];
+ ha->model_desc = qla2x00_model_name[index * 2 + 1];
} else
strcpy(ha->model_number, "QLA2462");