Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e2e833a authored by Kashyap, Desai's avatar Kashyap, Desai Committed by James Bottomley
Browse files

[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: default avatarKashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent f3eedd69

drivers/scsi/mpt2sas/mpt2sas_base.c

+10 −1
Original line number Diff line number Diff line
@@ -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++)