Skip to content

Commit

Permalink
net: eth: xgene: devm_ioremap() returns NULL on error
Browse files Browse the repository at this point in the history
devm_ioremap() returns NULL on failure, it doesn't return an ERR_PTR.

Fixes: de7b5b3 ('net: eth: xgene: change APM X-Gene SoC platform ethernet to support ACPI')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Dan Carpenter authored and David S. Miller committed Jan 12, 2015
1 parent 78890ed commit 3ec7a17
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/net/ethernet/apm/xgene/xgene_enet_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -804,9 +804,9 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
return -ENODEV;
}
pdata->base_addr = devm_ioremap(dev, res->start, resource_size(res));
if (IS_ERR(pdata->base_addr)) {
if (!pdata->base_addr) {
dev_err(dev, "Unable to retrieve ENET Port CSR region\n");
return PTR_ERR(pdata->base_addr);
return -ENOMEM;
}

res = platform_get_resource(pdev, IORESOURCE_MEM, RES_RING_CSR);
Expand All @@ -816,9 +816,9 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
}
pdata->ring_csr_addr = devm_ioremap(dev, res->start,
resource_size(res));
if (IS_ERR(pdata->ring_csr_addr)) {
if (!pdata->ring_csr_addr) {
dev_err(dev, "Unable to retrieve ENET Ring CSR region\n");
return PTR_ERR(pdata->ring_csr_addr);
return -ENOMEM;
}

res = platform_get_resource(pdev, IORESOURCE_MEM, RES_RING_CMD);
Expand All @@ -828,9 +828,9 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
}
pdata->ring_cmd_addr = devm_ioremap(dev, res->start,
resource_size(res));
if (IS_ERR(pdata->ring_cmd_addr)) {
if (!pdata->ring_cmd_addr) {
dev_err(dev, "Unable to retrieve ENET Ring command region\n");
return PTR_ERR(pdata->ring_cmd_addr);
return -ENOMEM;
}

ret = platform_get_irq(pdev, 0);
Expand Down

0 comments on commit 3ec7a17

Please sign in to comment.