Browse Source

drivers/net: Correct NULL test

Test the value that was just allocated rather than the previously tested one.

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

// <smpl>
@r@
expression *x;
expression e;
identifier l;
@@

if (x == NULL || ...) {
    ... when forall
    return ...; }
... when != goto l;
    when != x = e
    when != &x
*x == NULL
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Julia Lawall 15 years ago
parent
commit
bcf4d812e6
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/net/ax88796.c

+ 1 - 1
drivers/net/ax88796.c

@@ -921,7 +921,7 @@ static int ax_probe(struct platform_device *pdev)
  		size = (res->end - res->start) + 1;
  		size = (res->end - res->start) + 1;
 
 
 		ax->mem2 = request_mem_region(res->start, size, pdev->name);
 		ax->mem2 = request_mem_region(res->start, size, pdev->name);
-		if (ax->mem == NULL) {
+		if (ax->mem2 == NULL) {
 			dev_err(&pdev->dev, "cannot reserve registers\n");
 			dev_err(&pdev->dev, "cannot reserve registers\n");
 			ret = -ENXIO;
 			ret = -ENXIO;
 			goto exit_mem1;
 			goto exit_mem1;