aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/bnx2fc
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2013-01-21 08:02:49 -0500
committerJames Bottomley <JBottomley@Parallels.com>2013-01-29 22:04:54 -0500
commitb0d5e15cc4d76efacdfe8d974f50d2afc25123fe (patch)
tree4e2a395cb3914f6554b569d0b69acc71fec7512a /drivers/scsi/bnx2fc
parent72da7bcd68b38501b1e5b4c7bffab7a1093c5a40 (diff)
[SCSI] bnx2fc: adjust duplicate test
Delete successive tests to the same location. The code tested the result of a previous allocation, that itself was already tested. It is changed to test the result of the most recent allocation. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @s exists@ local idexpression y; expression x,e; @@ *if ( \(x == NULL\|IS_ERR(x)\|y != 0\) ) { ... when forall return ...; } ... when != \(y = e\|y += e\|y -= e\|y |= e\|y &= e\|y++\|y--\|&y\) when != \(XT_GETPAGE(...,y)\|WMI_CMD_BUF(...)\) *if ( \(x == NULL\|IS_ERR(x)\|y != 0\) ) { ... when forall return ...; } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Acked-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/bnx2fc')
-rw-r--r--drivers/scsi/bnx2fc/bnx2fc_io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index c661ccd3d496..60798e829de6 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -654,7 +654,7 @@ int bnx2fc_init_mp_req(struct bnx2fc_cmd *io_req)
654 mp_req->mp_resp_bd = dma_alloc_coherent(&hba->pcidev->dev, sz, 654 mp_req->mp_resp_bd = dma_alloc_coherent(&hba->pcidev->dev, sz,
655 &mp_req->mp_resp_bd_dma, 655 &mp_req->mp_resp_bd_dma,
656 GFP_ATOMIC); 656 GFP_ATOMIC);
657 if (!mp_req->mp_req_bd) { 657 if (!mp_req->mp_resp_bd) {
658 printk(KERN_ERR PFX "unable to alloc MP resp bd\n"); 658 printk(KERN_ERR PFX "unable to alloc MP resp bd\n");
659 bnx2fc_free_mp_resc(io_req); 659 bnx2fc_free_mp_resc(io_req);
660 return FAILED; 660 return FAILED;