tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

scsi: qla2xxx: Remove two superfluous if-tests

This patch fixes the following Coverity complaint:

Null-checking sp->u.iocb_cmd.u.ctarg.rsp suggests that it may be null, but
it has already been dereferenced on all paths leading to the check.

See also commit e374f9f59281 ("scsi: qla2xxx: Migrate switch registration commands away from mailbox interface") # v4.16.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Tested-by: Himanshu Madhani <hmadhani@marvell.com>
Reviewed-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Bart Van Assche and committed by
Martin K. Petersen 1778a0e7 c6e58160

+11 -14
+11 -14
drivers/scsi/qla2xxx/qla_gs.c
··· 3295 3295 e = qla2x00_alloc_work(vha, QLA_EVT_UNMAP); 3296 3296 if (!e) { 3297 3297 /* please ignore kernel warning. otherwise, we have mem leak. */ 3298 - if (sp->u.iocb_cmd.u.ctarg.req) { 3299 - dma_free_coherent(&vha->hw->pdev->dev, 3300 - sp->u.iocb_cmd.u.ctarg.req_allocated_size, 3301 - sp->u.iocb_cmd.u.ctarg.req, 3302 - sp->u.iocb_cmd.u.ctarg.req_dma); 3303 - sp->u.iocb_cmd.u.ctarg.req = NULL; 3304 - } 3305 - if (sp->u.iocb_cmd.u.ctarg.rsp) { 3306 - dma_free_coherent(&vha->hw->pdev->dev, 3307 - sp->u.iocb_cmd.u.ctarg.rsp_allocated_size, 3308 - sp->u.iocb_cmd.u.ctarg.rsp, 3309 - sp->u.iocb_cmd.u.ctarg.rsp_dma); 3310 - sp->u.iocb_cmd.u.ctarg.rsp = NULL; 3311 - } 3298 + dma_free_coherent(&vha->hw->pdev->dev, 3299 + sp->u.iocb_cmd.u.ctarg.req_allocated_size, 3300 + sp->u.iocb_cmd.u.ctarg.req, 3301 + sp->u.iocb_cmd.u.ctarg.req_dma); 3302 + sp->u.iocb_cmd.u.ctarg.req = NULL; 3303 + 3304 + dma_free_coherent(&vha->hw->pdev->dev, 3305 + sp->u.iocb_cmd.u.ctarg.rsp_allocated_size, 3306 + sp->u.iocb_cmd.u.ctarg.rsp, 3307 + sp->u.iocb_cmd.u.ctarg.rsp_dma); 3308 + sp->u.iocb_cmd.u.ctarg.rsp = NULL; 3312 3309 3313 3310 sp->free(sp); 3314 3311 return;