[SCSI] bnx2fc: adjust duplicate test
authorJulia Lawall <Julia.Lawall@lip6.fr>
Mon, 21 Jan 2013 13:02:49 +0000 (14:02 +0100)
committerJames Bottomley <JBottomley@Parallels.com>
Wed, 30 Jan 2013 03:04:54 +0000 (14:04 +1100)
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>
drivers/scsi/bnx2fc/bnx2fc_io.c

index c661ccd3d496f1575e3069b486f082d6711bbf19..60798e829de671f7bdf4151642814a79f42fe8c6 100644 (file)
@@ -654,7 +654,7 @@ int bnx2fc_init_mp_req(struct bnx2fc_cmd *io_req)
        mp_req->mp_resp_bd = dma_alloc_coherent(&hba->pcidev->dev, sz,
                                                 &mp_req->mp_resp_bd_dma,
                                                 GFP_ATOMIC);
-       if (!mp_req->mp_req_bd) {
+       if (!mp_req->mp_resp_bd) {
                printk(KERN_ERR PFX "unable to alloc MP resp bd\n");
                bnx2fc_free_mp_resc(io_req);
                return FAILED;