diff options
| author |   Wang Hai <wanghai38@huawei.com> | 2020-07-30 15:24:19 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-07-30 17:44:28 -0700 |
| commit | bd69058f50d5ffa659423bcfa6fe6280ce9c760a (patch) | |
| tree | b92ebb3578997999da2a3fc344456046ca1cdd73 /drivers/net/ethernet/xilinx | |
| parent | Merge branch 'net-ethernet-use-generic-power-management' (diff) | |
| download | linux-dev-bd69058f50d5ffa659423bcfa6fe6280ce9c760a.tar.xz linux-dev-bd69058f50d5ffa659423bcfa6fe6280ce9c760a.zip | |
net: ll_temac: Use devm_platform_ioremap_resource_byname()
platform_get_resource() may fail and return NULL, so we had better
check its return value to avoid a NULL pointer dereference a bit later
in the code. Fix it to use devm_platform_ioremap_resource_byname()
instead of calling platform_get_resource_byname() and devm_ioremap().
Fixes: 8425c41d1ef7 ("net: ll_temac: Extend support to non-device-tree platforms")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Hai <wanghai38@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/xilinx')
| -rw-r--r-- | drivers/net/ethernet/xilinx/ll_temac_main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index 929244064abd..9a15f14daa47 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c @@ -1407,10 +1407,8 @@ static int temac_probe(struct platform_device *pdev) } /* map device registers */ - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - lp->regs = devm_ioremap(&pdev->dev, res->start, - resource_size(res)); - if (!lp->regs) { + lp->regs = devm_platform_ioremap_resource_byname(pdev, 0); + if (IS_ERR(lp->regs)) { dev_err(&pdev->dev, "could not map TEMAC registers\n"); return -ENOMEM; } |