From 32a9275aecb805bfff0828f9716b3bbbbb393aad Mon Sep 17 00:00:00 2001 From: "Kashyap, Desai" Date: Wed, 17 Mar 2010 16:26:48 +0530 Subject: [PATCH] --- yaml --- r: 195583 b: refs/heads/master c: f6aee7b9aee96ef18354f0f86e65ec635ee5039f h: refs/heads/master i: 195581: bc90e74d8233f888897c0af331692c26d07c692c 195579: 030eb050f8ea6bfdbce092ae298ca6e3c73e6881 195575: 65b64f0492010ea7358243722cc46e711ffcf61a 195567: 94972f4dc2364be2312c24ab5aac6a9d8c9c17eb 195551: a788fbc9aca2fc91ea186a9d2b02aba5c90d6de3 195519: 45faa97225330aa9bc1ec72728ddf9bc8aa0fa6c 195455: 2f092a5c9b1eda4ccea185ebd46d25a10503b43c 195327: 184b6469b15d6ca747b06b803f2d9bef1d0d2602 195071: 38bb1eab7bbbaeb5370b5450ff131200fb9d37ad 194559: d61d5ef064409d30670291ba5c4ac2b1d22636bb v: v3 --- [refs] | 2 +- trunk/drivers/scsi/mpt2sas/mpt2sas_base.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8bc218b54d3d..febab9647311 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ed9a03ad4c1b6c5ae163e5e9f140852be0273a1 +refs/heads/master: f6aee7b9aee96ef18354f0f86e65ec635ee5039f diff --git a/trunk/drivers/scsi/mpt2sas/mpt2sas_base.c b/trunk/drivers/scsi/mpt2sas/mpt2sas_base.c index 6f786349679f..6c384dac5ec5 100644 --- a/trunk/drivers/scsi/mpt2sas/mpt2sas_base.c +++ b/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++)