netdev - Re: [patch -next] net: eth: xgene: devm

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 9 Jan 2015 14:56:53 -0800
From:	Iyappan Subramanian <isubramanian@....com>
To:	Dan Carpenter <dan.carpenter@...cle.com>
Cc:	Feng Kan <fkan@....com>, Keyur Chudgar <kchudgar@....com>,
	Grant Likely <grant.likely@...aro.org>,
	Rob Herring <robh+dt@...nel.org>,
	netdev <netdev@...r.kernel.org>, kernel-janitors@...r.kernel.org
Subject: Re: [patch -next] net: eth: xgene: devm_ioremap() returns NULL on error

On Thu, Jan 8, 2015 at 2:52 AM, Dan Carpenter <dan.carpenter@...cle.com> wrote:
> 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@...cle.com>
>
> diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
> index 1e56bf3..02add38 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)
>                 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);
> @@ -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);
> @@ -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);

Acked-by: Iyappan Subramanian <isubramanian@....com>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html