Skip to content

Commit bc7896d

Browse files
Dan Carpentermartinkpetersen
authored andcommitted
scsi: mpi3mr: Return error if dma_alloc_coherent() fails
Return -ENOMEM instead of success if dma_alloc_coherent() fails. Link: https://lore.kernel.org/r/YnOmMGHqCOtUCYQ1@kili Fixes: 43ca110 ("scsi: mpi3mr: Add support for PEL commands") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent e9dedc1 commit bc7896d

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

drivers/scsi/mpi3mr/mpi3mr_fw.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3754,8 +3754,10 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc)
37543754
mrioc->pel_seqnum_virt = dma_alloc_coherent(&mrioc->pdev->dev,
37553755
mrioc->pel_seqnum_sz, &mrioc->pel_seqnum_dma,
37563756
GFP_KERNEL);
3757-
if (!mrioc->pel_seqnum_virt)
3757+
if (!mrioc->pel_seqnum_virt) {
3758+
retval = -ENOMEM;
37583759
goto out_failed_noretry;
3760+
}
37593761
}
37603762

37613763
retval = mpi3mr_enable_events(mrioc);
@@ -3873,8 +3875,10 @@ int mpi3mr_reinit_ioc(struct mpi3mr_ioc *mrioc, u8 is_resume)
38733875
mrioc->pel_seqnum_virt = dma_alloc_coherent(&mrioc->pdev->dev,
38743876
mrioc->pel_seqnum_sz, &mrioc->pel_seqnum_dma,
38753877
GFP_KERNEL);
3876-
if (!mrioc->pel_seqnum_virt)
3878+
if (!mrioc->pel_seqnum_virt) {
3879+
retval = -ENOMEM;
38773880
goto out_failed_noretry;
3881+
}
38783882
}
38793883

38803884
if (mrioc->shost->nr_hw_queues > mrioc->num_op_reply_q) {

0 commit comments

Comments
 (0)