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

Commit 08a965ec authored by Amitoj Kaur Chawla's avatar Amitoj Kaur Chawla Committed by David S. Miller
Browse files

net: cavium: liquidio: Return correct error code 



The return value of vmalloc on failure of allocation of memory should
be -ENOMEM and not -1.

Found using Coccinelle. A simplified version of the semantic patch
used is:

//<smpl>
@@
expression *e;
identifier l1;
position p,q;
@@

e@q = vmalloc(...);
if@p (e == NULL) {
...
goto l1;
}
l1:
...
return -1
+ -ENOMEM
;
//</smpl

The single call site of the containing function checks whether the
returned value is -1, so this check is changed as well. The single call
site of this call site, however, only checks whether the value is not 0,
so no further change was required.

Signed-off-by: default avatarAmitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 21a75f09

drivers/net/ethernet/cavium/liquidio/lio_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1683,7 +1683,7 @@ static int octeon_setup_droq(struct octeon_device *oct, int q_no, int num_descs, 
	dev_dbg(&oct->pci_dev->dev, "Creating Droq: %d\n", q_no);

	/* droq creation and local register settings. */

	ret_val = octeon_create_droq(oct, q_no, num_descs, desc_size, app_ctx);

	if (ret_val == -1)

	if (ret_val < 0)

		return ret_val;



	if (ret_val == 1) {

drivers/net/ethernet/cavium/liquidio/octeon_droq.c

+1 −1
Original line number Diff line number Diff line
@@ -983,5 +983,5 @@ int octeon_create_droq(struct octeon_device *oct, 


create_droq_fail:

	octeon_delete_droq(oct, q_no);

	return -1;

	return -ENOMEM;

}