---

yaml
---
r: 195583
b: refs/heads/master
c: f6aee7b
h: refs/heads/master
i:
  195581: bc90e74
  195579: 030eb05
  195575: 65b64f0
  195567: 94972f4
  195551: a788fbc
  195519: 45faa97
  195455: 2f092a5
  195327: 184b646
  195071: 38bb1ea
  194559: d61d5ef
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ed9a03ad4c1b6c5ae163e5e9f140852be0273a1
+refs/heads/master: f6aee7b9aee96ef18354f0f86e65ec635ee5039f

trunk/drivers/scsi/mpt2sas/mpt2sas_base.c

@@ -3580,8 +3580,10 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc)
 
 	ioc->pfacts = kcalloc(ioc->facts.NumberOfPorts,
 	    sizeof(Mpi2PortFactsReply_t), GFP_KERNEL);
-	if (!ioc->pfacts)
+	if (!ioc->pfacts) {
+		r = -ENOMEM;
 		goto out_free_resources;
+	}
 
 	for (i = 0 ; i < ioc->facts.NumberOfPorts; i++) {
 		r = _base_get_port_facts(ioc, i, CAN_SLEEP);
@@ -3627,6 +3629,13 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc)
 	ioc->ctl_cmds.status = MPT2_CMD_NOT_USED;
 	mutex_init(&ioc->ctl_cmds.mutex);
 
+	if (!ioc->base_cmds.reply || !ioc->transport_cmds.reply ||
+	    !ioc->scsih_cmds.reply || !ioc->tm_cmds.reply ||
+	    !ioc->config_cmds.reply || !ioc->ctl_cmds.reply) {
+		r = -ENOMEM;
+		goto out_free_resources;
+	}
+
 	init_completion(&ioc->shost_recovery_done);
 
 	for (i = 0; i < MPI2_EVENT_NOTIFY_EVENTMASK_WORDS; i++)