diff options
| author | Armen Baloyan <armen.baloyan@qlogic.com> | 2013-10-30 08:38:08 +0100 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-12-19 16:38:56 +0100 |
| commit | a324031c4373fd9df55b771f8253f5df44371680 (patch) | |
| tree | f1f6715cdca45c783ed9220b5dd8aa43c4115159 | |
| parent | [SCSI] hpsa: prevent stalled i/o (diff) | |
| download | linux-a324031c4373fd9df55b771f8253f5df44371680.tar.xz linux-a324031c4373fd9df55b771f8253f5df44371680.zip | |
[SCSI] qla2xxx: Print proper QLAFX00 product name at probe.
Signed-off-by: Armen Baloyan <armen.baloyan@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_dbg.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c index ee5c1833eb73..acc1ea422cbc 100644 --- a/drivers/scsi/qla2xxx/qla_dbg.c +++ b/drivers/scsi/qla2xxx/qla_dbg.c @@ -11,7 +11,7 @@ * ---------------------------------------------------------------------- * | Level | Last Value Used | Holes | * ---------------------------------------------------------------------- - * | Module Init and Probe | 0x0159 | 0x4b,0xba,0xfa | + * | Module Init and Probe | 0x015a | 0x4b,0xba,0xfa | * | Mailbox commands | 0x1181 | 0x111a-0x111b | * | | | 0x1155-0x1158 | * | | | 0x1018-0x1019 | diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 52be35e0300c..2e4879b24963 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -2910,8 +2910,12 @@ skip_dpc: qla2x00_dfs_setup(base_vha); - ql_log(ql_log_info, base_vha, 0x00fb, - "QLogic %s - %s.\n", ha->model_number, ha->model_desc); + if (IS_QLAFX00(ha)) + ql_log(ql_log_info, base_vha, 0x015a, + "QLogic %s.\n", ha->mr.product_name); + else + ql_log(ql_log_info, base_vha, 0x00fb, + "QLogic %s - %s.\n", ha->model_number, ha->model_desc); ql_log(ql_log_info, base_vha, 0x00fc, "ISP%04X: %s @ %s hdma%c host#=%ld fw=%s.\n", pdev->device, ha->isp_ops->pci_info_str(base_vha, pci_info), |