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

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

IB/qib: Fix error return code in qib_init_7322_variables()

Convert a 0 error return code to a negative one, as returned elsewhere
in the function.

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

)

// <smpl>
@@
identifier ret;
expression e,e1,e2,e3,e4,x;
@@

(
if (\(ret != 0\|ret < 0\) || ...) { ... return ...; }
|
ret = 0
)
... when != ret = e1
*x = \(kmalloc\|kzalloc\|kcalloc\|devm_kzalloc\|ioremap\|ioremap_nocache\|devm_ioremap\|devm_ioremap_nocache\)(...);
... when != x = e2
    when != ret = e3
*if (x == NULL || ...)
{
  ... when != ret = e4
*  return ret;
}
// </smpl>

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Acked-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 0d7614f0
Loading
Loading
Loading
Loading
+3 −1
Original line number Original line Diff line number Diff line
@@ -6346,9 +6346,11 @@ static int qib_init_7322_variables(struct qib_devdata *dd)
			dd->piobcnt4k * dd->align4k;
			dd->piobcnt4k * dd->align4k;
		dd->piovl15base	= ioremap_nocache(vl15off,
		dd->piovl15base	= ioremap_nocache(vl15off,
						  NUM_VL15_BUFS * dd->align4k);
						  NUM_VL15_BUFS * dd->align4k);
		if (!dd->piovl15base)
		if (!dd->piovl15base) {
			ret = -ENOMEM;
			goto bail;
			goto bail;
		}
		}
	}
	qib_7322_set_baseaddrs(dd); /* set chip access pointers now */
	qib_7322_set_baseaddrs(dd); /* set chip access pointers now */


	ret = 0;
	ret = 0;