From: James Smart Date: Wed, 18 Dec 2013 01:29:59 +0000 (-0500) Subject: [SCSI] lpfc 8.3.44: Fixed incorrect allocation of iDiags directories/files in debugfs X-Git-Tag: v3.15-rc1~136^2~159 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f6c3bdfb93a71b06d31ad12447acf2cea04b3324;p=uclinux-h8%2Flinux.git [SCSI] lpfc 8.3.44: Fixed incorrect allocation of iDiags directories/files in debugfs Signed-off-by: James Smart Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c index b800cc952ca6..c3c3fbe43083 100644 --- a/drivers/scsi/lpfc/lpfc_debugfs.c +++ b/drivers/scsi/lpfc/lpfc_debugfs.c @@ -3927,6 +3927,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport) struct lpfc_hba *phba = vport->phba; char name[64]; uint32_t num, i; + bool pport_setup = false; if (!lpfc_debugfs_enable) return; @@ -3947,6 +3948,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport) /* Setup funcX directory for specific HBA PCI function */ snprintf(name, sizeof(name), "fn%d", phba->brd_no); if (!phba->hba_debugfs_root) { + pport_setup = true; phba->hba_debugfs_root = debugfs_create_dir(name, lpfc_debugfs_root); if (!phba->hba_debugfs_root) { @@ -4239,6 +4241,14 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport) } /* + * The following section is for additional directories/files for the + * physical port. + */ + + if (!pport_setup) + goto debug_failed; + + /* * iDiag debugfs root entry points for SLI4 device only */ if (phba->sli_rev < LPFC_SLI_REV4)