2 files changed, 8 insertions, 3 deletions

diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index a78036f5e1a6..82fa6ce481f0 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -2575,6 +2575,11 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc,  int sleep_flag)
 
         ioc->chain_lookup = (struct chain_tracker *)__get_free_pages(
             GFP_KERNEL, ioc->chain_pages);
+        if (!ioc->chain_lookup) {
+                printk(MPT2SAS_ERR_FMT "chain_lookup: get_free_pages failed, "
+                    "sz(%d)\n", ioc->name, (int)sz);
+                goto out;
+        }
         ioc->chain_dma_pool = pci_pool_create("chain pool", ioc->pdev,
             ioc->request_sz, 16, 0);
         if (!ioc->chain_dma_pool) {
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index 193e33e28e49..d953a57e779d 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -5744,7 +5744,7 @@ _scsih_sas_enclosure_dev_status_change_event(struct MPT2SAS_ADAPTER *ioc,
 }
 
 /**
- * _scsih_sas_broadcast_primative_event - handle broadcast events
+ * _scsih_sas_broadcast_primitive_event - handle broadcast events
  * @ioc: per adapter object
  * @fw_event: The fw_event_work object
  * Context: user.
@@ -5752,7 +5752,7 @@ _scsih_sas_enclosure_dev_status_change_event(struct MPT2SAS_ADAPTER *ioc,
  * Return nothing.
  */
 static void
-_scsih_sas_broadcast_primative_event(struct MPT2SAS_ADAPTER *ioc,
+_scsih_sas_broadcast_primitive_event(struct MPT2SAS_ADAPTER *ioc,
     struct fw_event_work *fw_event)
 {
         struct scsi_cmnd *scmd;
@@ -7263,7 +7263,7 @@ _firmware_event_work(struct work_struct *work)
                     fw_event);
                 break;
         case MPI2_EVENT_SAS_BROADCAST_PRIMITIVE:
-                _scsih_sas_broadcast_primative_event(ioc,
+                _scsih_sas_broadcast_primitive_event(ioc,
                     fw_event);
                 break;
         case MPI2_EVENT_SAS_ENCL_DEVICE_STATUS_CHANGE: