diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-01-08 05:52:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-12 15:40:18 -0500 |
commit | 3ec7a176fa81107c20f1693c64873c11a6cd8fa4 (patch) | |
tree | 7d469bb3062ecbc25e598acf9d030527a22686a2 | |
parent | 78890ed7549444fa9b9ff7e544d6bdd44b4c9566 (diff) |
net: eth: xgene: devm_ioremap() returns NULL on error
devm_ioremap() returns NULL on failure, it doesn't return an ERR_PTR.
Fixes: de7b5b3d790a ('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>
-rw-r--r-- | drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c index 1e56bf30366f..02add385a33d 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c | |||
@@ -804,9 +804,9 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata) | |||
804 | return -ENODEV; | 804 | return -ENODEV; |
805 | } | 805 | } |
806 | pdata->base_addr = devm_ioremap(dev, res->start, resource_size(res)); | 806 | pdata->base_addr = devm_ioremap(dev, res->start, resource_size(res)); |
807 | if (IS_ERR(pdata->base_addr)) { | 807 | if (!pdata->base_addr) { |
808 | dev_err(dev, "Unable to retrieve ENET Port CSR region\n"); | 808 | dev_err(dev, "Unable to retrieve ENET Port CSR region\n"); |
809 | return PTR_ERR(pdata->base_addr); | 809 | return -ENOMEM; |
810 | } | 810 | } |
811 | 811 | ||
812 | res = platform_get_resource(pdev, IORESOURCE_MEM, RES_RING_CSR); | 812 | res = platform_get_resource(pdev, IORESOURCE_MEM, RES_RING_CSR); |
@@ -816,9 +816,9 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata) | |||
816 | } | 816 | } |
817 | pdata->ring_csr_addr = devm_ioremap(dev, res->start, | 817 | pdata->ring_csr_addr = devm_ioremap(dev, res->start, |
818 | resource_size(res)); | 818 | resource_size(res)); |
819 | if (IS_ERR(pdata->ring_csr_addr)) { | 819 | if (!pdata->ring_csr_addr) { |
820 | dev_err(dev, "Unable to retrieve ENET Ring CSR region\n"); | 820 | dev_err(dev, "Unable to retrieve ENET Ring CSR region\n"); |
821 | return PTR_ERR(pdata->ring_csr_addr); | 821 | return -ENOMEM; |
822 | } | 822 | } |
823 | 823 | ||
824 | res = platform_get_resource(pdev, IORESOURCE_MEM, RES_RING_CMD); | 824 | res = platform_get_resource(pdev, IORESOURCE_MEM, RES_RING_CMD); |
@@ -828,9 +828,9 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata) | |||
828 | } | 828 | } |
829 | pdata->ring_cmd_addr = devm_ioremap(dev, res->start, | 829 | pdata->ring_cmd_addr = devm_ioremap(dev, res->start, |
830 | resource_size(res)); | 830 | resource_size(res)); |
831 | if (IS_ERR(pdata->ring_cmd_addr)) { | 831 | if (!pdata->ring_cmd_addr) { |
832 | dev_err(dev, "Unable to retrieve ENET Ring command region\n"); | 832 | dev_err(dev, "Unable to retrieve ENET Ring command region\n"); |
833 | return PTR_ERR(pdata->ring_cmd_addr); | 833 | return -ENOMEM; |
834 | } | 834 | } |
835 | 835 | ||
836 | ret = platform_get_irq(pdev, 0); | 836 | ret = platform_get_irq(pdev, 0); |