On Tue, 2014-04-08 at 22:44 +0300, Matei Oprea wrote: > It's easier to use kcalloc for allocating arrays. While at it > also remove useless casting value. > > Signed-off-by: Matei Oprea <eu@xxxxxxxxxxxxx> > Cc: ROSEdu Kernel Community <firefly@xxxxxxxxxxxxxxxx> > --- > drivers/scsi/lpfc/lpfc_init.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c > index 635eeb3..e286909 100644 > --- a/drivers/scsi/lpfc/lpfc_init.c > +++ b/drivers/scsi/lpfc/lpfc_init.c > @@ -4742,12 +4742,12 @@ lpfc_sli_driver_resource_setup(struct lpfc_hba *phba) > phba->cfg_sg_seg_cnt = LPFC_DEFAULT_MENLO_SG_SEG_CNT; > } > > - if (!phba->sli.ring) > - phba->sli.ring = (struct lpfc_sli_ring *) > - kzalloc(LPFC_SLI3_MAX_RING * > - sizeof(struct lpfc_sli_ring), GFP_KERNEL); > - if (!phba->sli.ring) > + if (!phba->sli.ring) { > + phba->sli.ring = kcalloc(LPFC_SLI3_MAX_RING, > + sizeof(struct lpfc_sli_ring), > + GFP_KERNEL); > return -ENOMEM; > + } You seem to be returning -ENOMEM after kcalloc. You need to put back the if (!phba->sli.ring) return -ENOMEM; after the alloc. -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html