From 50ca69510850b437c988ee010d53b70b334dcb11 Mon Sep 17 00:00:00 2001 From: James Smart Date: Sat, 29 Sep 2012 11:30:06 -0400 Subject: [PATCH] --- yaml --- r: 334120 b: refs/heads/master c: 5402a3158118ff3c67376f5fca7ad0da68e3ba0e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/lpfc/lpfc.h | 2 ++ trunk/drivers/scsi/lpfc/lpfc_init.c | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3242268e8b80..09997975e71b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82c3e9bafa25f287e20f097258a630ecd2877c5b +refs/heads/master: 5402a3158118ff3c67376f5fca7ad0da68e3ba0e diff --git a/trunk/drivers/scsi/lpfc/lpfc.h b/trunk/drivers/scsi/lpfc/lpfc.h index a184c2443a64..69b59935b53f 100644 --- a/trunk/drivers/scsi/lpfc/lpfc.h +++ b/trunk/drivers/scsi/lpfc/lpfc.h @@ -27,6 +27,8 @@ struct lpfc_sli2_slim; +#define ELX_MODEL_NAME_SIZE 80 + #define LPFC_PCI_DEV_LP 0x1 #define LPFC_PCI_DEV_OC 0x2 diff --git a/trunk/drivers/scsi/lpfc/lpfc_init.c b/trunk/drivers/scsi/lpfc/lpfc_init.c index 12014eb528ea..7a981d1956d6 100644 --- a/trunk/drivers/scsi/lpfc/lpfc_init.c +++ b/trunk/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) int mcnt; int adjusted_fcp_io_channel; const struct firmware *fw; - uint8_t file_name[16]; + uint8_t file_name[ELX_MODEL_NAME_SIZE]; /* Allocate memory for HBA structure */ phba = lpfc_hba_alloc(pdev); @@ -9574,7 +9574,8 @@ lpfc_pci_probe_one_s4(struct pci_dev *pdev, const struct pci_device_id *pid) /* check for firmware upgrade or downgrade (if_type 2 only) */ if (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) == LPFC_SLI_INTF_IF_TYPE_2) { - snprintf(file_name, 16, "%s.grp", phba->ModelName); + snprintf(file_name, ELX_MODEL_NAME_SIZE, "%s.grp", + phba->ModelName); error = request_firmware(&fw, file_name, &phba->pcidev->dev); if (!error) { lpfc_write_firmware(phba, fw);