diff options
-rw-r--r-- | drivers/scsi/lpfc/lpfc.h | 2 | ||||
-rw-r--r-- | drivers/scsi/lpfc/lpfc_init.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h index a184c2443a64..69b59935b53f 100644 --- a/drivers/scsi/lpfc/lpfc.h +++ b/drivers/scsi/lpfc/lpfc.h | |||
@@ -27,6 +27,8 @@ | |||
27 | 27 | ||
28 | struct lpfc_sli2_slim; | 28 | struct lpfc_sli2_slim; |
29 | 29 | ||
30 | #define ELX_MODEL_NAME_SIZE 80 | ||
31 | |||
30 | #define LPFC_PCI_DEV_LP 0x1 | 32 | #define LPFC_PCI_DEV_LP 0x1 |
31 | #define LPFC_PCI_DEV_OC 0x2 | 33 | #define LPFC_PCI_DEV_OC 0x2 |
32 | 34 | ||
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 12014eb528ea..7a981d1956d6 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c | |||
@@ -9428,7 +9428,7 @@ lpfc_pci_probe_one_s4(struct pci_dev *pdev, const struct pci_device_id *pid) | |||
9428 | int mcnt; | 9428 | int mcnt; |
9429 | int adjusted_fcp_io_channel; | 9429 | int adjusted_fcp_io_channel; |
9430 | const struct firmware *fw; | 9430 | const struct firmware *fw; |
9431 | uint8_t file_name[16]; | 9431 | uint8_t file_name[ELX_MODEL_NAME_SIZE]; |
9432 | 9432 | ||
9433 | /* Allocate memory for HBA structure */ | 9433 | /* Allocate memory for HBA structure */ |
9434 | phba = lpfc_hba_alloc(pdev); | 9434 | phba = lpfc_hba_alloc(pdev); |
@@ -9574,7 +9574,8 @@ lpfc_pci_probe_one_s4(struct pci_dev *pdev, const struct pci_device_id *pid) | |||
9574 | /* check for firmware upgrade or downgrade (if_type 2 only) */ | 9574 | /* check for firmware upgrade or downgrade (if_type 2 only) */ |
9575 | if (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) == | 9575 | if (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) == |
9576 | LPFC_SLI_INTF_IF_TYPE_2) { | 9576 | LPFC_SLI_INTF_IF_TYPE_2) { |
9577 | snprintf(file_name, 16, "%s.grp", phba->ModelName); | 9577 | snprintf(file_name, ELX_MODEL_NAME_SIZE, "%s.grp", |
9578 | phba->ModelName); | ||
9578 | error = request_firmware(&fw, file_name, &phba->pcidev->dev); | 9579 | error = request_firmware(&fw, file_name, &phba->pcidev->dev); |
9579 | if (!error) { | 9580 | if (!error) { |
9580 | lpfc_write_firmware(phba, fw); | 9581 | lpfc_write_firmware(phba, fw); |