diff --git a/[refs] b/[refs] index 1b16ecc901b4..a59a81663ec0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f004ec728bff3cf924ffc19387baca503cd73b01 +refs/heads/master: 463889e27e6f4f097374a6c9de5611f520766dad diff --git a/trunk/drivers/net/ethoc.c b/trunk/drivers/net/ethoc.c index ceb6a9c357ad..4dbe5f173273 100644 --- a/trunk/drivers/net/ethoc.c +++ b/trunk/drivers/net/ethoc.c @@ -894,7 +894,7 @@ static int ethoc_probe(struct platform_device *pdev) mmio = devm_request_mem_region(&pdev->dev, res->start, res->end - res->start + 1, res->name); - if (!res) { + if (!mmio) { dev_err(&pdev->dev, "cannot request I/O memory space\n"); ret = -ENXIO; goto free;