From: Kashyap, Desai Date: Thu, 17 Jun 2010 08:17:29 +0000 (+0530) Subject: [SCSI] mpt2sas: Added -ENOMEM return type when allocation fails X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3e2e833a547cbd0cb3fbe85a5f6ee71a93931fde;p=linux-beck.git [SCSI] mpt2sas: Added -ENOMEM return type when allocation fails In the driver mpt2sas_base_attach subroutine, we need to add support to return the proper error code when there are memory allocation failures, e.g. returning -ENOMEM. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c index bb8acf781690..d84874492cbf 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.c +++ b/drivers/scsi/mpt2sas/mpt2sas_base.c @@ -3634,8 +3634,10 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc) ioc->pd_handles_sz++; ioc->pd_handles = kzalloc(ioc->pd_handles_sz, GFP_KERNEL); - if (!ioc->pd_handles) + if (!ioc->pd_handles) { + r = -ENOMEM; goto out_free_resources; + } ioc->fwfault_debug = mpt2sas_fwfault_debug; @@ -3676,6 +3678,13 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc) goto out_free_resources; } + 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++)