diff --git a/[refs] b/[refs] index c63d4902fc8c..4209d9724e76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3af26f58d1920d904da87c3897d23070fe2266b4 +refs/heads/master: bcf4d812e66ee95f762b38063d654fd1ff7156b0 diff --git a/trunk/drivers/net/ax88796.c b/trunk/drivers/net/ax88796.c index 62d9c9cc5671..1dd4403247ca 100644 --- a/trunk/drivers/net/ax88796.c +++ b/trunk/drivers/net/ax88796.c @@ -921,7 +921,7 @@ static int ax_probe(struct platform_device *pdev) size = (res->end - res->start) + 1; 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"); ret = -ENXIO; goto exit_mem1;