Merge branch 'master' into for-next

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / lpfc / lpfc_hbadisc.c

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index a5d1695dac3dcd73b1e5cae6651c46c602d57d20..0873fbd19e186e54bd9259edafd461d671cb6ed8 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -2790,7 +2790,7 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, READ_LA_VAR *la)
                        if (unlikely(!fcf_record)) {
                                lpfc_printf_log(phba, KERN_ERR,
                                        LOG_MBOX | LOG_SLI,
-                                       "2554 Could not allocate memmory for "
+                                       "2554 Could not allocate memory for "
                                        "fcf record\n");
                                rc = -ENODEV;
                                goto out;