Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab576627 authored by Julia Lawall's avatar Julia Lawall Committed by Roland Dreier
Browse files

RDMA/amso1100: Fix error return code 

Set the return variable to an error code as done elsewhere in the function.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/

)

// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}

// </smpl>

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 38dbfb59

drivers/infiniband/hw/amso1100/c2.c

+3 −1
Original line number Diff line number Diff line
@@ -1082,6 +1082,7 @@ static int c2_probe(struct pci_dev *pcidev, const struct pci_device_id *ent) 


	/* Initialize network device */

	if ((netdev = c2_devinit(c2dev, mmio_regs)) == NULL) {

		ret = -ENOMEM;

		iounmap(mmio_regs);

		goto bail4;

	}
@@ -1151,7 +1152,8 @@ static int c2_probe(struct pci_dev *pcidev, const struct pci_device_id *ent) 
		goto bail10;

	}



	if (c2_register_device(c2dev))

	ret = c2_register_device(c2dev);

	if (ret)

		goto bail10;



	return 0;

drivers/infiniband/hw/amso1100/c2_rnic.c

+2 −1
Original line number Diff line number Diff line
@@ -576,7 +576,8 @@ int c2_rnic_init(struct c2_dev *c2dev) 
		goto bail4;



	/* Initialize cached the adapter limits */

	if (c2_rnic_query(c2dev, &c2dev->props))

	err = c2_rnic_query(c2dev, &c2dev->props);

	if (err)

		goto bail5;



	/* Initialize the PD pool */