net: ll_temac: Use devm_platform_ioremap_resource_byname()
authorWang Hai <wanghai38@huawei.com>
Thu, 30 Jul 2020 07:24:19 +0000 (15:24 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 31 Jul 2020 00:44:28 +0000 (17:44 -0700)
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>
drivers/net/ethernet/xilinx/ll_temac_main.c

index 929244064abd97038a9f41034ee5d61df5fbb951..9a15f14daa479a13e3450f81dc765b2028e9fcdf 100644 (file)
@@ -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;
        }