Merge branch 'master' into for-next

1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/scsi/lpfc/lpfc_vport.c b/drivers/scsi/lpfc/lpfc_vport.c
index dc86e873102a..ffd575c379f3 100644
--- a/drivers/scsi/lpfc/lpfc_vport.c
+++ b/drivers/scsi/lpfc/lpfc_vport.c
@@ -26,6 +26,7 @@
 #include <linux/interrupt.h>
 #include <linux/kthread.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <linux/spinlock.h>
 
 #include <scsi/scsi.h>
@@ -123,7 +124,12 @@ lpfc_vport_sparm(struct lpfc_hba *phba, struct lpfc_vport *vport)
         }
         mb = &pmb->u.mb;
 
-        lpfc_read_sparam(phba, pmb, vport->vpi);
+        rc = lpfc_read_sparam(phba, pmb, vport->vpi);
+        if (rc) {
+                mempool_free(pmb, phba->mbox_mem_pool);
+                return -ENOMEM;
+        }
+
         /*
          * Grab buffer pointer and clear context1 so we can use
          * lpfc_sli_issue_box_wait